make/lib/Awt2dLibraries.gmk
branchdatagramsocketimpl-branch
changeset 58678 9cf78a70fa4f
parent 54999 98ed47cd114a
child 58679 9c3209ff7550
equal deleted inserted replaced
58677:13588c901957 58678:9cf78a70fa4f
    37 
    37 
    38 ################################################################################
    38 ################################################################################
    39 
    39 
    40 # We must not include java.desktop/unix/native/libmlib_image, which is only
    40 # We must not include java.desktop/unix/native/libmlib_image, which is only
    41 # for usage by solaris-sparc in libmlib_image_v.
    41 # for usage by solaris-sparc in libmlib_image_v.
    42 BUILD_LIBMLIB_EXCLUDE_SRC_PATTERNS := unix
    42 BUILD_LIBMLIB_EXCLUDE_SRC_PATTERNS := /unix/
    43 
    43 
    44 BUILD_LIBMLIB_CFLAGS := -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES -DMLIB_NO_LIBSUNMATH
    44 BUILD_LIBMLIB_CFLAGS := -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES -DMLIB_NO_LIBSUNMATH
    45 
    45 
    46 ifeq ($(call isTargetCpuBits, 64), true)
    46 ifeq ($(call isTargetCpuBits, 64), true)
    47   BUILD_LIBMLIB_CFLAGS += -DMLIB_OS64BIT
    47   BUILD_LIBMLIB_CFLAGS += -DMLIB_OS64BIT
   469       OPTIMIZATION := LOW, \
   469       OPTIMIZATION := LOW, \
   470       CFLAGS := $(CFLAGS_JDKLIB) \
   470       CFLAGS := $(CFLAGS_JDKLIB) \
   471           $(LIBAWT_HEADLESS_CFLAGS), \
   471           $(LIBAWT_HEADLESS_CFLAGS), \
   472       EXTRA_HEADER_DIRS := $(LIBAWT_HEADLESS_EXTRA_HEADER_DIRS), \
   472       EXTRA_HEADER_DIRS := $(LIBAWT_HEADLESS_EXTRA_HEADER_DIRS), \
   473       DISABLED_WARNINGS_gcc := unused-function, \
   473       DISABLED_WARNINGS_gcc := unused-function, \
   474       DISABLED_WARNINGS_xlc := 1506-356, \
       
   475       DISABLED_WARNINGS_solstudio := E_EMPTY_TRANSLATION_UNIT, \
   474       DISABLED_WARNINGS_solstudio := E_EMPTY_TRANSLATION_UNIT, \
   476       LDFLAGS := $(LDFLAGS_JDKLIB) \
   475       LDFLAGS := $(LDFLAGS_JDKLIB) \
   477           $(call SET_SHARED_LIBRARY_ORIGIN), \
   476           $(call SET_SHARED_LIBRARY_ORIGIN), \
   478       LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
   477       LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
   479       LIBS_unix := -lawt -ljvm -ljava, \
   478       LIBS_unix := -lawt -ljvm -ljava, \
   480       LIBS_linux := $(LIBM) $(LIBDL), \
   479       LIBS_linux := $(LIBM) $(LIBDL), \
   481       LIBS_solaris := $(LIBM) $(LIBDL) $(LIBCXX), \
   480       LIBS_solaris := $(LIBM) $(LIBDL) $(LIBCXX), \
   482   ))
   481   ))
   483 
       
   484   # AIX warning explanation:
       
   485   # 1506-356 : (W) Compilation unit is empty.
       
   486   #            This happens during the headless build
       
   487 
   482 
   488   $(BUILD_LIBAWT_HEADLESS): $(BUILD_LIBAWT)
   483   $(BUILD_LIBAWT_HEADLESS): $(BUILD_LIBAWT)
   489 
   484 
   490   TARGETS += $(BUILD_LIBAWT_HEADLESS)
   485   TARGETS += $(BUILD_LIBAWT_HEADLESS)
   491 
   486 
   696 
   691 
   697 else # not windows
   692 else # not windows
   698 
   693 
   699   ifeq ($(call isTargetOs, macosx), true)
   694   ifeq ($(call isTargetOs, macosx), true)
   700     # libjawt on macosx do not use the unix code
   695     # libjawt on macosx do not use the unix code
   701     LIBJAWT_EXCLUDE_SRC_PATTERNS := unix
   696     LIBJAWT_EXCLUDE_SRC_PATTERNS := /unix/
   702   endif
   697   endif
   703 
   698 
   704   ifeq ($(call isTargetOs, macosx), true)
   699   ifeq ($(call isTargetOs, macosx), true)
   705     JAWT_LIBS := -lawt_lwawt
   700     JAWT_LIBS := -lawt_lwawt
   706   else
   701   else
   786     LIBSPLASHSCREEN_EXTRA_SRC += java.base:libzip/zlib
   781     LIBSPLASHSCREEN_EXTRA_SRC += java.base:libzip/zlib
   787   endif
   782   endif
   788 
   783 
   789   ifeq ($(call isTargetOs, macosx), true)
   784   ifeq ($(call isTargetOs, macosx), true)
   790     # libsplashscreen on macosx do not use the unix code
   785     # libsplashscreen on macosx do not use the unix code
   791     LIBSPLASHSCREEN_EXCLUDE_SRC_PATTERNS := unix
   786     LIBSPLASHSCREEN_EXCLUDE_SRC_PATTERNS := /unix/
   792   endif
   787   endif
   793 
   788 
   794   LIBSPLASHSCREEN_CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE -DPNG_ARM_NEON_OPT=0
   789   LIBSPLASHSCREEN_CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE \
       
   790                             -DPNG_ARM_NEON_OPT=0 -DPNG_ARM_NEON_IMPLEMENTATION=0
   795 
   791 
   796   ifeq ($(call isTargetOs, linux), true)
   792   ifeq ($(call isTargetOs, linux), true)
   797     ifeq ($(call isTargetCpuArch, ppc), true)
   793     ifeq ($(call isTargetCpuArch, ppc), true)
   798       LIBSPLASHSCREEN_CFLAGS += -DPNG_POWERPC_VSX_OPT=0
   794       LIBSPLASHSCREEN_CFLAGS += -DPNG_POWERPC_VSX_OPT=0
   799     endif
   795     endif
   821   ifeq ($(call isTargetOs, macosx), true)
   817   ifeq ($(call isTargetOs, macosx), true)
   822     LIBSPLASHSCREEN_LIBS += \
   818     LIBSPLASHSCREEN_LIBS += \
   823         $(LIBM) -lpthread -liconv -losxapp \
   819         $(LIBM) -lpthread -liconv -losxapp \
   824         -framework ApplicationServices \
   820         -framework ApplicationServices \
   825         -framework Foundation \
   821         -framework Foundation \
       
   822         -framework Security \
   826         -framework Cocoa \
   823         -framework Cocoa \
   827         -framework JavaNativeFoundation
   824         -framework JavaNativeFoundation
   828   else ifeq ($(call isTargetOs, windows), true)
   825   else ifeq ($(call isTargetOs, windows), true)
   829     LIBSPLASHSCREEN_LIBS += kernel32.lib user32.lib gdi32.lib delayimp.lib $(WIN_JAVA_LIB) jvm.lib
   826     LIBSPLASHSCREEN_LIBS += kernel32.lib user32.lib gdi32.lib delayimp.lib $(WIN_JAVA_LIB) jvm.lib
   830   else
   827   else