make/lib/Awt2dLibraries.gmk
branchihse-cflags-rewrite-branch
changeset 56312 a52bcf4118eb
parent 56251 57c4d01d02dc
parent 49244 995a5556edfa
child 56726 3a9b7a1f9197
equal deleted inserted replaced
56285:9bc8db601fe2 56312:a52bcf4118eb
    46 
    46 
    47 ifneq ($(OPENJDK_TARGET_OS), windows)
    47 ifneq ($(OPENJDK_TARGET_OS), windows)
    48   BUILD_LIBMLIB_LDLIBS += $(LIBM) $(LIBDL)
    48   BUILD_LIBMLIB_LDLIBS += $(LIBM) $(LIBDL)
    49 endif
    49 endif
    50 
    50 
    51 $(eval $(call SetupNativeCompilation, BUILD_LIBMLIB_IMAGE, \
    51 $(eval $(call SetupJdkLibrary, BUILD_LIBMLIB_IMAGE, \
    52     NAME := mlib_image, \
    52     NAME := mlib_image, \
    53     OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
       
    54     SRC := $(BUILD_LIBMLIB_SRC), \
    53     SRC := $(BUILD_LIBMLIB_SRC), \
    55     EXCLUDE_FILES := mlib_c_ImageBlendTable.c, \
    54     EXCLUDE_FILES := mlib_c_ImageBlendTable.c, \
    56     OPTIMIZATION := HIGHEST, \
    55     OPTIMIZATION := HIGHEST, \
    57     CFLAGS := $(CFLAGS_JDKLIB) \
    56     CFLAGS := $(CFLAGS_JDKLIB) \
    58         $(BUILD_LIBMLIB_CFLAGS), \
    57         $(BUILD_LIBMLIB_CFLAGS), \
    59     MAPFILE := $(BUILD_LIBMLIB_IMAGE_MAPFILE), \
    58     MAPFILE := $(BUILD_LIBMLIB_IMAGE_MAPFILE), \
    60     LDFLAGS := $(LDFLAGS_JDKLIB) \
    59     LDFLAGS := $(LDFLAGS_JDKLIB) \
    61         $(call SET_SHARED_LIBRARY_ORIGIN), \
    60         $(call SET_SHARED_LIBRARY_ORIGIN), \
    62     LIBS := $(BUILD_LIBMLIB_LDLIBS) \
    61     LIBS := $(BUILD_LIBMLIB_LDLIBS) \
    63         $(JDKLIB_LIBS), \
    62         $(JDKLIB_LIBS), \
    64     LIBS_solaris := -lc, \
       
    65     VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
       
    66     RC_FLAGS := $(RC_FLAGS) \
       
    67         -D "JDK_FNAME=mlib_image.dll" \
       
    68         -D "JDK_INTERNAL_NAME=mlib_image" \
       
    69         -D "JDK_FTYPE=0x2L", \
       
    70     OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libmlib_image, \
       
    71 ))
    63 ))
    72 
    64 
    73 $(BUILD_LIBMLIB_IMAGE): $(call FindLib, java.base, java)
    65 $(BUILD_LIBMLIB_IMAGE): $(call FindLib, java.base, java)
    74 
    66 
    75 TARGETS += $(BUILD_LIBMLIB_IMAGE)
    67 TARGETS += $(BUILD_LIBMLIB_IMAGE)
   105       mlib_c_ImageLookUp_f.c \
    97       mlib_c_ImageLookUp_f.c \
   106       #
    98       #
   107 
    99 
   108   LIBMLIB_IMAGE_V_CFLAGS += $(filter-out -DMLIB_NO_LIBSUNMATH, $(BUILD_LIBMLIB_CFLAGS))
   100   LIBMLIB_IMAGE_V_CFLAGS += $(filter-out -DMLIB_NO_LIBSUNMATH, $(BUILD_LIBMLIB_CFLAGS))
   109 
   101 
   110   $(eval $(call SetupNativeCompilation, BUILD_LIBMLIB_IMAGE_V, \
   102   $(eval $(call SetupJdkLibrary, BUILD_LIBMLIB_IMAGE_V, \
   111       NAME := mlib_image_v, \
   103       NAME := mlib_image_v, \
   112       OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
       
   113       SRC := $(LIBMLIB_IMAGE_V_SRC), \
   104       SRC := $(LIBMLIB_IMAGE_V_SRC), \
   114       EXCLUDE_FILES := $(BUILD_LIBMLIB_IMAGE_V_EXFILES), \
   105       EXCLUDE_FILES := $(BUILD_LIBMLIB_IMAGE_V_EXFILES), \
   115       OPTIMIZATION := HIGHEST, \
   106       OPTIMIZATION := HIGHEST, \
   116       CFLAGS := -xarch=sparcvis \
   107       CFLAGS := -xarch=sparcvis \
   117           $(LIBMLIB_IMAGE_V_CFLAGS) \
   108           $(LIBMLIB_IMAGE_V_CFLAGS) \
   118           $(CFLAGS_JDKLIB), \
   109           $(CFLAGS_JDKLIB), \
   119       MAPFILE := $(BUILD_LIBMLIB_IMAGE_MAPFILE), \
   110       MAPFILE := $(BUILD_LIBMLIB_IMAGE_MAPFILE), \
   120       LDFLAGS := $(LDFLAGS_JDKLIB) \
   111       LDFLAGS := $(LDFLAGS_JDKLIB) \
   121           $(call SET_SHARED_LIBRARY_ORIGIN), \
   112           $(call SET_SHARED_LIBRARY_ORIGIN), \
   122       LIBS := -ljava -ljvm -lc $(BUILD_LIBMLIB_LDLIBS), \
   113       LIBS := -ljava -ljvm $(BUILD_LIBMLIB_LDLIBS), \
   123       OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libmlib_image_v, \
       
   124   ))
   114   ))
   125 
   115 
   126   $(BUILD_LIBMLIB_IMAGE_V): $(call FindLib, java.base, java)
   116   $(BUILD_LIBMLIB_IMAGE_V): $(call FindLib, java.base, java)
   127 
   117 
   128   TARGETS += $(BUILD_LIBMLIB_IMAGE_V)
   118   TARGETS += $(BUILD_LIBMLIB_IMAGE_V)
   224   BUILD_LIBAWT_debug_mem.c_CFLAGS := -w
   214   BUILD_LIBAWT_debug_mem.c_CFLAGS := -w
   225   # This option improves performance of MaskFill in Java2D by 20% for some gcc
   215   # This option improves performance of MaskFill in Java2D by 20% for some gcc
   226   LIBAWT_CFLAGS += -fgcse-after-reload
   216   LIBAWT_CFLAGS += -fgcse-after-reload
   227 endif
   217 endif
   228 
   218 
   229 $(eval $(call SetupNativeCompilation, BUILD_LIBAWT, \
   219 $(eval $(call SetupJdkLibrary, BUILD_LIBAWT, \
   230     NAME := awt, \
   220     NAME := awt, \
   231     OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
       
   232     SRC := $(LIBAWT_DIRS), \
   221     SRC := $(LIBAWT_DIRS), \
   233     EXCLUDES := $(LIBAWT_EXCLUDES), \
   222     EXCLUDES := $(LIBAWT_EXCLUDES), \
   234     EXCLUDE_FILES := $(LIBAWT_EXFILES), \
   223     EXCLUDE_FILES := $(LIBAWT_EXFILES), \
   235     OPTIMIZATION := LOW, \
   224     OPTIMIZATION := LOW, \
   236     CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_CFLAGS), \
   225     CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_CFLAGS), \
   247         -delayload:winspool.drv -delayload:imm32.dll \
   236         -delayload:winspool.drv -delayload:imm32.dll \
   248         -delayload:ole32.dll -delayload:comdlg32.dll \
   237         -delayload:ole32.dll -delayload:comdlg32.dll \
   249         -delayload:comctl32.dll -delayload:shlwapi.dll, \
   238         -delayload:comctl32.dll -delayload:shlwapi.dll, \
   250     LIBS_unix := -ljvm -ljava $(LIBM), \
   239     LIBS_unix := -ljvm -ljava $(LIBM), \
   251     LIBS_linux :=  $(LIBDL), \
   240     LIBS_linux :=  $(LIBDL), \
   252     LIBS_solaris := $(LIBDL) -lc, \
   241     LIBS_solaris := $(LIBDL), \
   253     LIBS_aix := $(LIBDL),\
   242     LIBS_aix := $(LIBDL),\
   254     LIBS_macosx := -lmlib_image \
   243     LIBS_macosx := -lmlib_image \
   255         -framework Cocoa \
   244         -framework Cocoa \
   256         -framework OpenGL \
   245         -framework OpenGL \
   257         -framework JavaNativeFoundation \
   246         -framework JavaNativeFoundation \
   265     VERSIONINFO_RESOURCE := $(LIBAWT_VERSIONINFO_RESOURCE), \
   254     VERSIONINFO_RESOURCE := $(LIBAWT_VERSIONINFO_RESOURCE), \
   266     RC_FLAGS := $(RC_FLAGS) $(LIBAWT_RC_FLAGS) \
   255     RC_FLAGS := $(RC_FLAGS) $(LIBAWT_RC_FLAGS) \
   267         -D "JDK_FNAME=awt.dll" \
   256         -D "JDK_FNAME=awt.dll" \
   268         -D "JDK_INTERNAL_NAME=awt" \
   257         -D "JDK_INTERNAL_NAME=awt" \
   269         -D "JDK_FTYPE=0x2L", \
   258         -D "JDK_FTYPE=0x2L", \
   270     OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libawt, \
       
   271 ))
   259 ))
   272 
   260 
   273 $(BUILD_LIBAWT): $(call FindLib, java.base, java)
   261 $(BUILD_LIBAWT): $(call FindLib, java.base, java)
   274 
   262 
   275 ifeq ($(OPENJDK_TARGET_OS), macosx)
   263 ifeq ($(OPENJDK_TARGET_OS), macosx)
   327       ifeq ($(DISABLE_XRENDER), true)
   315       ifeq ($(DISABLE_XRENDER), true)
   328         LIBAWT_XAWT_CFLAGS += -DDISABLE_XRENDER_BY_DEFAULT=true
   316         LIBAWT_XAWT_CFLAGS += -DDISABLE_XRENDER_BY_DEFAULT=true
   329       endif
   317       endif
   330     endif
   318     endif
   331 
   319 
   332     LIBAWT_XAWT_LIBS := $(LIBM) -lawt -lXext -lX11 -lXrender $(LIBDL) -lXtst -lXi -ljava -ljvm -lc
   320     LIBAWT_XAWT_LIBS := $(LIBM) -lawt -lXext -lX11 -lXrender $(LIBDL) -lXtst -lXi -ljava -ljvm
   333 
   321 
   334     ifeq ($(OPENJDK_TARGET_OS), linux)
   322     ifeq ($(OPENJDK_TARGET_OS), linux)
   335       LIBAWT_XAWT_LIBS += -lpthread
   323       LIBAWT_XAWT_LIBS += -lpthread
   336     endif
   324     endif
   337 
   325 
   344       BUILD_LIBAWT_XAWT_awt_Font.c_CFLAGS := -w
   332       BUILD_LIBAWT_XAWT_awt_Font.c_CFLAGS := -w
   345       # initializing a declared 'extern'
   333       # initializing a declared 'extern'
   346       BUILD_LIBAWT_XAWT_debug_mem.c_CFLAGS := -w
   334       BUILD_LIBAWT_XAWT_debug_mem.c_CFLAGS := -w
   347    endif
   335    endif
   348 
   336 
   349     $(eval $(call SetupNativeCompilation, BUILD_LIBAWT_XAWT, \
   337     $(eval $(call SetupJdkLibrary, BUILD_LIBAWT_XAWT, \
   350         NAME := awt_xawt, \
   338         NAME := awt_xawt, \
   351         OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
       
   352         SRC := $(LIBAWT_XAWT_DIRS), \
   339         SRC := $(LIBAWT_XAWT_DIRS), \
   353         EXCLUDES := $(LIBAWT_XAWT_EXCLUDES), \
   340         EXCLUDES := $(LIBAWT_XAWT_EXCLUDES), \
   354         OPTIMIZATION := LOW, \
   341         OPTIMIZATION := LOW, \
   355         CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_XAWT_CFLAGS) \
   342         CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_XAWT_CFLAGS) \
   356             $(X_CFLAGS), \
   343             $(X_CFLAGS), \
   364         MAPFILE := $(TOPDIR)/make/mapfiles/libawt_xawt/mapfile-vers, \
   351         MAPFILE := $(TOPDIR)/make/mapfiles/libawt_xawt/mapfile-vers, \
   365         LDFLAGS := $(LDFLAGS_JDKLIB) \
   352         LDFLAGS := $(LDFLAGS_JDKLIB) \
   366             $(call SET_SHARED_LIBRARY_ORIGIN) \
   353             $(call SET_SHARED_LIBRARY_ORIGIN) \
   367             -L$(INSTALL_LIBRARIES_HERE), \
   354             -L$(INSTALL_LIBRARIES_HERE), \
   368         LIBS :=  $(X_LIBS) $(LIBAWT_XAWT_LIBS), \
   355         LIBS :=  $(X_LIBS) $(LIBAWT_XAWT_LIBS), \
   369         VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
       
   370         RC_FLAGS := $(RC_FLAGS) \
   356         RC_FLAGS := $(RC_FLAGS) \
   371             -D "JDK_FNAME=xawt.dll" \
   357             -D "JDK_FNAME=xawt.dll" \
   372             -D "JDK_INTERNAL_NAME=xawt" \
   358             -D "JDK_INTERNAL_NAME=xawt" \
   373             -D "JDK_FTYPE=0x2L", \
   359             -D "JDK_FTYPE=0x2L", \
   374         OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libawt_xawt, \
       
   375     ))
   360     ))
   376 
   361 
   377     $(BUILD_LIBAWT_XAWT): $(call FindLib, java.base, java)
   362     $(BUILD_LIBAWT_XAWT): $(call FindLib, java.base, java)
   378 
   363 
   379     $(BUILD_LIBAWT_XAWT): $(BUILD_LIBAWT)
   364     $(BUILD_LIBAWT_XAWT): $(BUILD_LIBAWT)
   403   # If we're using the bundled library, we'll need to include it in the
   388   # If we're using the bundled library, we'll need to include it in the
   404   # include path explicitly. Otherwise the system headers will be used.
   389   # include path explicitly. Otherwise the system headers will be used.
   405   LIBLCMS_CPPFLAGS += $(addprefix -I, $(LIBLCMS_SRC))
   390   LIBLCMS_CPPFLAGS += $(addprefix -I, $(LIBLCMS_SRC))
   406 endif
   391 endif
   407 
   392 
   408 $(eval $(call SetupNativeCompilation, BUILD_LIBLCMS, \
   393 $(eval $(call SetupJdkLibrary, BUILD_LIBLCMS, \
   409     NAME := lcms, \
   394     NAME := lcms, \
   410     OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
       
   411     SRC := $(LIBLCMS_SRC), \
   395     SRC := $(LIBLCMS_SRC), \
   412     INCLUDE_FILES := $(BUILD_LIBLCMS_INCLUDE_FILES), \
   396     INCLUDE_FILES := $(BUILD_LIBLCMS_INCLUDE_FILES), \
   413     OPTIMIZATION := HIGHEST, \
   397     OPTIMIZATION := HIGHEST, \
   414     CFLAGS := $(filter-out -xc99=%none, $(CFLAGS_JDKLIB)) \
   398     CFLAGS := $(filter-out -xc99=%none, $(CFLAGS_JDKLIB)) \
   415         $(LIBLCMS_CPPFLAGS) \
   399         $(LIBLCMS_CPPFLAGS) \
   426     LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
   410     LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
   427     LDFLAGS_solaris := /usr/lib$(OPENJDK_TARGET_CPU_ISADIR)/libm.so.2, \
   411     LDFLAGS_solaris := /usr/lib$(OPENJDK_TARGET_CPU_ISADIR)/libm.so.2, \
   428     LIBS_unix := -lawt -ljvm -ljava $(LCMS_LIBS), \
   412     LIBS_unix := -lawt -ljvm -ljava $(LCMS_LIBS), \
   429     LIBS_linux := $(LIBM), \
   413     LIBS_linux := $(LIBM), \
   430     LIBS_macosx := $(LIBM), \
   414     LIBS_macosx := $(LIBM), \
   431     LIBS_solaris := -lc, \
       
   432     LIBS_aix := $(LIBM),\
   415     LIBS_aix := $(LIBM),\
   433     LIBS_windows := $(WIN_AWT_LIB) $(WIN_JAVA_LIB), \
   416     LIBS_windows := $(WIN_AWT_LIB) $(WIN_JAVA_LIB), \
   434     VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
       
   435     RC_FLAGS := $(RC_FLAGS) \
       
   436         -D "JDK_FNAME=lcms.dll" \
       
   437         -D "JDK_INTERNAL_NAME=lcms" \
       
   438         -D "JDK_FTYPE=0x2L", \
       
   439     OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/liblcms, \
       
   440 ))
   417 ))
   441 
   418 
   442 TARGETS += $(BUILD_LIBLCMS)
   419 TARGETS += $(BUILD_LIBLCMS)
   443 
   420 
   444 $(BUILD_LIBLCMS): $(BUILD_LIBAWT)
   421 $(BUILD_LIBLCMS): $(BUILD_LIBAWT)
   480   LIBJPEG_LIBS :=
   457   LIBJPEG_LIBS :=
   481   BUILD_LIBJAVAJPEG_INCLUDE_FILES :=
   458   BUILD_LIBJAVAJPEG_INCLUDE_FILES :=
   482   BUILD_LIBJAVAJPEG_HEADERS := $(addprefix -I, $(LIBJAVAJPEG_SRC))
   459   BUILD_LIBJAVAJPEG_HEADERS := $(addprefix -I, $(LIBJAVAJPEG_SRC))
   483 endif
   460 endif
   484 
   461 
   485 $(eval $(call SetupNativeCompilation, BUILD_LIBJAVAJPEG, \
   462 $(eval $(call SetupJdkLibrary, BUILD_LIBJAVAJPEG, \
   486     NAME := javajpeg, \
   463     NAME := javajpeg, \
   487     OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
       
   488     SRC := $(LIBJAVAJPEG_SRC), \
   464     SRC := $(LIBJAVAJPEG_SRC), \
   489     INCLUDE_FILES := $(BUILD_LIBJAVAJPEG_INCLUDE_FILES), \
   465     INCLUDE_FILES := $(BUILD_LIBJAVAJPEG_INCLUDE_FILES), \
   490     OPTIMIZATION := HIGHEST, \
   466     OPTIMIZATION := HIGHEST, \
   491     CFLAGS := $(CFLAGS_JDKLIB) $(BUILD_LIBJAVAJPEG_HEADERS) \
   467     CFLAGS := $(CFLAGS_JDKLIB) $(BUILD_LIBJAVAJPEG_HEADERS) \
   492         $(LIBJAVA_HEADER_FLAGS) \
   468         $(LIBJAVA_HEADER_FLAGS) \
   495     MAPFILE := $(TOPDIR)/make/mapfiles/libjpeg/mapfile-vers, \
   471     MAPFILE := $(TOPDIR)/make/mapfiles/libjpeg/mapfile-vers, \
   496     LDFLAGS := $(LDFLAGS_JDKLIB) \
   472     LDFLAGS := $(LDFLAGS_JDKLIB) \
   497         $(call SET_SHARED_LIBRARY_ORIGIN), \
   473         $(call SET_SHARED_LIBRARY_ORIGIN), \
   498     LIBS := $(LIBJPEG_LIBS) $(JDKLIB_LIBS), \
   474     LIBS := $(LIBJPEG_LIBS) $(JDKLIB_LIBS), \
   499     LIBS_windows := $(WIN_JAVA_LIB) jvm.lib, \
   475     LIBS_windows := $(WIN_JAVA_LIB) jvm.lib, \
   500     VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
       
   501     RC_FLAGS := $(RC_FLAGS) \
       
   502         -D "JDK_FNAME=javajpeg.dll" \
       
   503         -D "JDK_INTERNAL_NAME=javajpeg" \
       
   504         -D "JDK_FTYPE=0x2L", \
       
   505     REORDER := $(BUILD_LIBJAVAJPEG_REORDER), \
   476     REORDER := $(BUILD_LIBJAVAJPEG_REORDER), \
   506     OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjavajpeg, \
       
   507 ))
   477 ))
   508 
   478 
   509 $(BUILD_LIBJAVAJPEG): $(call FindLib, java.base, java)
   479 $(BUILD_LIBJAVAJPEG): $(call FindLib, java.base, java)
   510 
   480 
   511 TARGETS += $(BUILD_LIBJAVAJPEG)
   481 TARGETS += $(BUILD_LIBJAVAJPEG)
   544     ifneq ($(OPENJDK_TARGET_CPU), x86_64)
   514     ifneq ($(OPENJDK_TARGET_CPU), x86_64)
   545       LIBAWT_HEADLESS_REORDER := $(TOPDIR)/make/mapfiles/libawt_headless/reorder-$(OPENJDK_TARGET_CPU)
   515       LIBAWT_HEADLESS_REORDER := $(TOPDIR)/make/mapfiles/libawt_headless/reorder-$(OPENJDK_TARGET_CPU)
   546     endif
   516     endif
   547   endif
   517   endif
   548 
   518 
   549   $(eval $(call SetupNativeCompilation, BUILD_LIBAWT_HEADLESS, \
   519   $(eval $(call SetupJdkLibrary, BUILD_LIBAWT_HEADLESS, \
   550       NAME := awt_headless, \
   520       NAME := awt_headless, \
   551       OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
       
   552       SRC := $(LIBAWT_HEADLESS_DIRS), \
   521       SRC := $(LIBAWT_HEADLESS_DIRS), \
   553       EXCLUDES := $(LIBAWT_HEADLESS_EXCLUDES), \
   522       EXCLUDES := $(LIBAWT_HEADLESS_EXCLUDES), \
   554       OPTIMIZATION := LOW, \
   523       OPTIMIZATION := LOW, \
   555       CFLAGS := $(CFLAGS_JDKLIB) \
   524       CFLAGS := $(CFLAGS_JDKLIB) \
   556           -DHEADLESS=true \
   525           -DHEADLESS=true \
   566           $(call SET_SHARED_LIBRARY_ORIGIN), \
   535           $(call SET_SHARED_LIBRARY_ORIGIN), \
   567       LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
   536       LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
   568       REORDER := $(LIBAWT_HEADLESS_REORDER), \
   537       REORDER := $(LIBAWT_HEADLESS_REORDER), \
   569       LIBS_unix := -lawt -ljvm -ljava, \
   538       LIBS_unix := -lawt -ljvm -ljava, \
   570       LIBS_linux := $(LIBM) $(LIBDL), \
   539       LIBS_linux := $(LIBM) $(LIBDL), \
   571       LIBS_solaris := $(LIBM) $(LIBDL) $(LIBCXX) -lc, \
   540       LIBS_solaris := $(LIBM) $(LIBDL) $(LIBCXX), \
   572       OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libawt_headless, \
       
   573   ))
   541   ))
   574 
   542 
   575   # AIX warning explanation:
   543   # AIX warning explanation:
   576   # 1506-356 : (W) Compilation unit is empty.
   544   # 1506-356 : (W) Compilation unit is empty.
   577   #            This happens during the headless build
   545   #            This happens during the headless build
   581   TARGETS += $(BUILD_LIBAWT_HEADLESS)
   549   TARGETS += $(BUILD_LIBAWT_HEADLESS)
   582 
   550 
   583 endif
   551 endif
   584 
   552 
   585 ################################################################################
   553 ################################################################################
       
   554 
       
   555 ifeq ($(FREETYPE_TO_USE), system)
       
   556   LIBFREETYPE_CFLAGS := $(FREETYPE_CFLAGS)
       
   557   LIBFREETYPE_LIBS := $(FREETYPE_LIBS)
       
   558 else
       
   559   LIBFREETYPE_SRC := $(TOPDIR)/src/java.desktop/share/native/libfreetype
       
   560   BUILD_LIBFREETYPE_HEADERS := $(addprefix -I, $(LIBFREETYPE_SRC)/include)
       
   561   LIBFREETYPE_CFLAGS := $(BUILD_LIBFREETYPE_HEADERS)
       
   562   ifeq ($(OPENJDK_TARGET_OS), windows)
       
   563     LIBFREETYPE_LIBS := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libfreetype/freetype.lib
       
   564   else
       
   565     LIBFREETYPE_LIBS := -lfreetype
       
   566   endif
       
   567 
       
   568   $(eval $(call SetupJdkLibrary, BUILD_LIBFREETYPE, \
       
   569       NAME := freetype, \
       
   570       SRC := $(LIBFREETYPE_SRC)/src, \
       
   571       OPTIMIZATION := HIGHEST, \
       
   572       CFLAGS := $(CFLAGS_JDKLIB) $(BUILD_LIBFREETYPE_HEADERS) \
       
   573           -DFT2_BUILD_LIBRARY, \
       
   574       DISABLED_WARNINGS_solstudio := \
       
   575          E_STATEMENT_NOT_REACHED \
       
   576          E_END_OF_LOOP_CODE_NOT_REACHED, \
       
   577       DISABLED_WARNINGS_microsoft := 4267 2220 4244, \
       
   578       LDFLAGS := $(LDFLAGS_JDKLIB) \
       
   579           $(call SET_SHARED_LIBRARY_ORIGIN), \
       
   580   ))
       
   581 
       
   582   TARGETS += $(BUILD_LIBFREETYPE)
       
   583 endif
       
   584 
       
   585 ###########################################################################
   586 
   586 
   587 LIBFONTMANAGER_SRC := $(TOPDIR)/src/java.desktop/share/native/libfontmanager \
   587 LIBFONTMANAGER_SRC := $(TOPDIR)/src/java.desktop/share/native/libfontmanager \
   588     $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libfontmanager
   588     $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libfontmanager
   589 LIBFONTMANAGER_CFLAGS := \
   589 LIBFONTMANAGER_CFLAGS := \
   590     $(addprefix -I, $(shell $(FIND) \
   590     $(addprefix -I, $(shell $(FIND) \
   622 
   622 
   623 LIBFONTMANAGER_CFLAGS += $(HARFBUZZ_CFLAGS)
   623 LIBFONTMANAGER_CFLAGS += $(HARFBUZZ_CFLAGS)
   624 
   624 
   625 #### End harfbuzz configuration
   625 #### End harfbuzz configuration
   626 
   626 
   627 LIBFONTMANAGER_CFLAGS += $(FREETYPE_CFLAGS)
   627 LIBFONTMANAGER_CFLAGS += $(LIBFREETYPE_CFLAGS)
   628 # This may be overridden in a custom makefile
   628 # This may be overridden in a custom makefile
   629 BUILD_LIBFONTMANAGER_MAPFILE ?= $(TOPDIR)/make/mapfiles/libfontmanager/mapfile-vers
   629 BUILD_LIBFONTMANAGER_MAPFILE ?= $(TOPDIR)/make/mapfiles/libfontmanager/mapfile-vers
   630 BUILD_LIBFONTMANAGER_FONTLIB += $(FREETYPE_LIBS)
   630 BUILD_LIBFONTMANAGER_FONTLIB += $(LIBFREETYPE_LIBS)
   631 
   631 
   632 LIBFONTMANAGER_OPTIMIZATION := HIGH
   632 LIBFONTMANAGER_OPTIMIZATION := HIGH
   633 
   633 
   634 ifeq ($(OPENJDK_TARGET_OS), windows)
   634 ifeq ($(OPENJDK_TARGET_OS), windows)
   635   LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \
   635   LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \
   654   BUILD_LIBFONTMANAGER_sunFont.c_CFLAGS := -w
   654   BUILD_LIBFONTMANAGER_sunFont.c_CFLAGS := -w
   655   # Turn off aliasing with GCC for ExtensionSubtables.cpp
   655   # Turn off aliasing with GCC for ExtensionSubtables.cpp
   656   BUILD_LIBFONTMANAGER_ExtensionSubtables.cpp_CXXFLAGS := -fno-strict-aliasing
   656   BUILD_LIBFONTMANAGER_ExtensionSubtables.cpp_CXXFLAGS := -fno-strict-aliasing
   657 endif
   657 endif
   658 
   658 
   659 $(eval $(call SetupNativeCompilation, BUILD_LIBFONTMANAGER, \
   659 $(eval $(call SetupJdkLibrary, BUILD_LIBFONTMANAGER, \
   660     NAME := fontmanager, \
   660     NAME := fontmanager, \
   661     OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libfontmanager, \
       
   662     SRC := $(LIBFONTMANAGER_SRC), \
   661     SRC := $(LIBFONTMANAGER_SRC), \
   663     EXCLUDE_FILES := $(LIBFONTMANAGER_EXCLUDE_FILES) \
   662     EXCLUDE_FILES := $(LIBFONTMANAGER_EXCLUDE_FILES) \
   664         AccelGlyphCache.c, \
   663         AccelGlyphCache.c, \
   665     TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
   664     TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
   666     CFLAGS := $(CFLAGS_JDKLIB) $(LIBFONTMANAGER_CFLAGS), \
   665     CFLAGS := $(CFLAGS_JDKLIB) $(LIBFONTMANAGER_CFLAGS), \
   687         $(call SET_SHARED_LIBRARY_ORIGIN), \
   686         $(call SET_SHARED_LIBRARY_ORIGIN), \
   688     LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
   687     LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
   689     LDFLAGS_macosx := -undefined dynamic_lookup, \
   688     LDFLAGS_macosx := -undefined dynamic_lookup, \
   690     LIBS := $(BUILD_LIBFONTMANAGER_FONTLIB), \
   689     LIBS := $(BUILD_LIBFONTMANAGER_FONTLIB), \
   691     LIBS_unix := -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \
   690     LIBS_unix := -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \
   692     LIBS_linux := -lc, \
       
   693     LIBS_solaris := -lc, \
       
   694     LIBS_aix := -lawt_headless,\
   691     LIBS_aix := -lawt_headless,\
   695     LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \
   692     LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \
   696         $(WIN_AWT_LIB), \
   693         $(WIN_AWT_LIB), \
   697     VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
       
   698     RC_FLAGS := $(RC_FLAGS) \
       
   699         -D "JDK_FNAME=fontmanager.dll" \
       
   700         -D "JDK_INTERNAL_NAME=fontmanager" \
       
   701         -D "JDK_FTYPE=0x2L", \
       
   702     OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libfontmanager, \
       
   703 ))
   694 ))
   704 
       
   705 $(INSTALL_LIBRARIES_HERE)/$(call SHARED_LIBRARY,fontmanager): $(BUILD_LIBFONTMANAGER_TARGET)
       
   706 	$(install-file)
       
   707         ifneq ($(FREETYPE_BUNDLE_LIB_PATH), )
       
   708           ifeq ($(OPENJDK_TARGET_OS), macosx)
       
   709             # If bundling freetype on macosx, we need to rewrite the rpath location
       
   710             # in the libfontmanager library to point to the bundled location
       
   711 	    $(INSTALL_NAME_TOOL) -change \
       
   712 	        `$(OTOOL) -D $(FREETYPE_BUNDLE_LIB_PATH)/$(call SHARED_LIBRARY,freetype) | $(TAIL) -n1` \
       
   713 	        '@rpath/$(call SHARED_LIBRARY,freetype)' \
       
   714 	        $@
       
   715           endif
       
   716         endif
       
   717 
       
   718 BUILD_LIBFONTMANAGER += $(INSTALL_LIBRARIES_HERE)/$(call SHARED_LIBRARY,fontmanager)
       
   719 
   695 
   720 $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT)
   696 $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT)
   721 
   697 
   722 ifneq (, $(findstring $(OPENJDK_TARGET_OS), solaris aix))
   698 ifneq (, $(findstring $(OPENJDK_TARGET_OS), solaris aix))
   723   $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT_HEADLESS)
   699   $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT_HEADLESS)
       
   700 endif
       
   701 
       
   702 ifeq ($(FREETYPE_TO_USE), bundled)
       
   703   $(BUILD_LIBFONTMANAGER): $(BUILD_LIBFREETYPE)
   724 endif
   704 endif
   725 
   705 
   726 TARGETS += $(BUILD_LIBFONTMANAGER)
   706 TARGETS += $(BUILD_LIBFONTMANAGER)
   727 
   707 
   728 ################################################################################
   708 ################################################################################
   741       #
   721       #
   742 
   722 
   743   ifeq ($(OPENJDK_TARGET_CPU), x86)
   723   ifeq ($(OPENJDK_TARGET_CPU), x86)
   744     KERNEL32_LIB := kernel32.lib
   724     KERNEL32_LIB := kernel32.lib
   745   endif
   725   endif
   746   $(eval $(call SetupNativeCompilation, BUILD_LIBJAWT, \
   726   $(eval $(call SetupJdkLibrary, BUILD_LIBJAWT, \
   747       NAME := jawt, \
   727       NAME := jawt, \
   748       OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
       
   749       SRC := $(LIBJAWT_SRC), \
   728       SRC := $(LIBJAWT_SRC), \
   750       INCLUDE_FILES := $(LIBJAWT_INCLUDE_FILES), \
   729       INCLUDE_FILES := $(LIBJAWT_INCLUDE_FILES), \
   751       OPTIMIZATION := LOW, \
   730       OPTIMIZATION := LOW, \
   752       CFLAGS := $(CXXFLAGS_JDKLIB) \
   731       CFLAGS := $(CXXFLAGS_JDKLIB) \
   753           -EHsc -DUNICODE -D_UNICODE \
   732           -EHsc -DUNICODE -D_UNICODE \
   754           $(LIBJAWT_CFLAGS), \
   733           $(LIBJAWT_CFLAGS), \
   755       LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \
   734       LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \
   756       LIBS := $(JDKLIB_LIBS) $(KERNEL32_LIB) advapi32.lib $(WIN_AWT_LIB), \
   735       LIBS := $(JDKLIB_LIBS) $(KERNEL32_LIB) advapi32.lib $(WIN_AWT_LIB), \
   757       VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
       
   758       RC_FLAGS := $(RC_FLAGS) \
       
   759           -D "JDK_FNAME=jawt.dll" \
       
   760           -D "JDK_INTERNAL_NAME=jawt" \
       
   761           -D "JDK_FTYPE=0x2L", \
       
   762       OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjawt, \
       
   763   ))
   736   ))
   764 
   737 
   765   $(BUILD_LIBJAWT): $(BUILD_LIBAWT)
   738   $(BUILD_LIBJAWT): $(BUILD_LIBAWT)
   766 
   739 
   767   $(eval $(call SetupCopyFiles, COPY_JAWT_LIB, \
   740   $(eval $(call SetupCopyFiles, COPY_JAWT_LIB, \
   801       JAWT_LIBS += -lawt_headless
   774       JAWT_LIBS += -lawt_headless
   802       HEADLESS_CFLAG += -DHEADLESS
   775       HEADLESS_CFLAG += -DHEADLESS
   803     endif
   776     endif
   804   endif
   777   endif
   805 
   778 
   806   $(eval $(call SetupNativeCompilation, BUILD_LIBJAWT, \
   779   $(eval $(call SetupJdkLibrary, BUILD_LIBJAWT, \
   807       NAME := jawt, \
   780       NAME := jawt, \
   808       OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
       
   809       SRC := $(LIBJAWT_SRC), \
   781       SRC := $(LIBJAWT_SRC), \
   810       INCLUDE_FILES := $(JAWT_FILES), \
   782       INCLUDE_FILES := $(JAWT_FILES), \
   811       OPTIMIZATION := LOW, \
   783       OPTIMIZATION := LOW, \
   812       CFLAGS := $(CFLAGS_JDKLIB) \
   784       CFLAGS := $(CFLAGS_JDKLIB) \
   813           $(LIBJAWT_CFLAGS), \
   785           $(LIBJAWT_CFLAGS), \
   819       LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
   791       LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
   820       LDFLAGS_macosx := -Wl$(COMMA)-rpath$(COMMA)@loader_path, \
   792       LDFLAGS_macosx := -Wl$(COMMA)-rpath$(COMMA)@loader_path, \
   821       LIBS_unix := $(JAWT_LIBS) $(JDKLIB_LIBS), \
   793       LIBS_unix := $(JAWT_LIBS) $(JDKLIB_LIBS), \
   822       LIBS_solaris := $(X_LIBS) -lXrender, \
   794       LIBS_solaris := $(X_LIBS) -lXrender, \
   823       LIBS_macosx := -framework Cocoa, \
   795       LIBS_macosx := -framework Cocoa, \
   824       OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjawt, \
       
   825   ))
   796   ))
   826 
   797 
   827   ifeq ($(ENABLE_HEADLESS_ONLY), false)
   798   ifeq ($(ENABLE_HEADLESS_ONLY), false)
   828     $(BUILD_LIBJAWT): $(BUILD_LIBAWT_XAWT)
   799     $(BUILD_LIBJAWT): $(BUILD_LIBAWT_XAWT)
   829   else
   800   else
   918       endif
   889       endif
   919     endif
   890     endif
   920   endif
   891   endif
   921 
   892 
   922   ifeq ($(OPENJDK_TARGET_OS), macosx)
   893   ifeq ($(OPENJDK_TARGET_OS), macosx)
   923     LIBSPLASHSCREEN_LDFLAGS := -L$(INSTALL_LIBRARIES_HERE)
       
   924     LIBSPLASHSCREEN_LIBS += \
   894     LIBSPLASHSCREEN_LIBS += \
   925         $(LIBM) -lpthread -liconv -losxapp \
   895         $(LIBM) -lpthread -liconv -losxapp \
   926         -framework ApplicationServices \
   896         -framework ApplicationServices \
   927         -framework Foundation \
   897         -framework Foundation \
   928         -framework Cocoa \
   898         -framework Cocoa \
   929         -framework JavaNativeFoundation
   899         -framework JavaNativeFoundation
   930   else ifeq ($(OPENJDK_TARGET_OS), windows)
   900   else ifeq ($(OPENJDK_TARGET_OS), windows)
   931     LIBSPLASHSCREEN_LDFLAGS := -delayload:user32.dll
       
   932     LIBSPLASHSCREEN_LIBS += kernel32.lib user32.lib gdi32.lib delayimp.lib $(WIN_JAVA_LIB) jvm.lib
   901     LIBSPLASHSCREEN_LIBS += kernel32.lib user32.lib gdi32.lib delayimp.lib $(WIN_JAVA_LIB) jvm.lib
   933   else
   902   else
   934     LIBSPLASHSCREEN_LIBS += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread -ldl
   903     LIBSPLASHSCREEN_LIBS += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread -ldl
   935   endif
   904   endif
   936 
   905 
   937   $(eval $(call SetupNativeCompilation, BUILD_LIBSPLASHSCREEN, \
   906   $(eval $(call SetupJdkLibrary, BUILD_LIBSPLASHSCREEN, \
   938       NAME := splashscreen, \
   907       NAME := splashscreen, \
   939       OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
       
   940       SRC := $(LIBSPLASHSCREEN_DIRS), \
   908       SRC := $(LIBSPLASHSCREEN_DIRS), \
   941       EXCLUDE_FILES := imageioJPEG.c jpegdecoder.c pngtest.c, \
   909       EXCLUDE_FILES := imageioJPEG.c jpegdecoder.c pngtest.c, \
   942       EXCLUDES := $(LIBSPLASHSCREEN_EXCLUDES), \
   910       EXCLUDES := $(LIBSPLASHSCREEN_EXCLUDES), \
   943       OPTIMIZATION := LOW, \
   911       OPTIMIZATION := LOW, \
   944       CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \
   912       CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \
   947           maybe-uninitialized shift-negative-value implicit-fallthrough, \
   915           maybe-uninitialized shift-negative-value implicit-fallthrough, \
   948       DISABLED_WARNINGS_clang := incompatible-pointer-types, \
   916       DISABLED_WARNINGS_clang := incompatible-pointer-types, \
   949       DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \
   917       DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \
   950       DISABLED_WARNINGS_microsoft := 4018 4244 4267, \
   918       DISABLED_WARNINGS_microsoft := 4018 4244 4267, \
   951       MAPFILE := $(TOPDIR)/make/mapfiles/libsplashscreen/mapfile-vers, \
   919       MAPFILE := $(TOPDIR)/make/mapfiles/libsplashscreen/mapfile-vers, \
   952       LDFLAGS := $(LIBSPLASHSCREEN_LDFLAGS) $(LDFLAGS_JDKLIB) \
   920       LDFLAGS := $(LDFLAGS_JDKLIB) \
   953           $(call SET_SHARED_LIBRARY_ORIGIN), \
   921           $(call SET_SHARED_LIBRARY_ORIGIN), \
       
   922       LDFLAGS_macosx := -L$(INSTALL_LIBRARIES_HERE), \
       
   923       LDFLAGS_windows := -delayload:user32.dll, \
   954       LIBS := $(JDKLIB_LIBS) $(LIBSPLASHSCREEN_LIBS) $(LIBZ_LIBS) \
   924       LIBS := $(JDKLIB_LIBS) $(LIBSPLASHSCREEN_LIBS) $(LIBZ_LIBS) \
   955           $(GIFLIB_LIBS) $(LIBJPEG_LIBS) $(PNG_LIBS), \
   925           $(GIFLIB_LIBS) $(LIBJPEG_LIBS) $(PNG_LIBS), \
   956       LIBS_aix := -liconv, \
   926       LIBS_aix := -liconv, \
   957       VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
       
   958       RC_FLAGS := $(RC_FLAGS) \
       
   959           -D "JDK_FNAME=splashscreen.dll" \
       
   960           -D "JDK_INTERNAL_NAME=splashscreen" \
       
   961           -D "JDK_FTYPE=0x2L", \
       
   962       OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libsplashscreen, \
       
   963   ))
   927   ))
   964 
   928 
   965   TARGETS += $(BUILD_LIBSPLASHSCREEN)
   929   TARGETS += $(BUILD_LIBSPLASHSCREEN)
   966 
   930 
   967   ifeq ($(OPENJDK_TARGET_OS), macosx)
   931   ifeq ($(OPENJDK_TARGET_OS), macosx)
  1004       #
   968       #
  1005 
   969 
  1006   LIBAWT_LWAWT_EXFILES := fontpath.c awt_Font.c X11Color.c
   970   LIBAWT_LWAWT_EXFILES := fontpath.c awt_Font.c X11Color.c
  1007   LIBAWT_LWAWT_EXCLUDES := $(TOPDIR)/src/java.desktop/unix/native/common/awt/medialib
   971   LIBAWT_LWAWT_EXCLUDES := $(TOPDIR)/src/java.desktop/unix/native/common/awt/medialib
  1008 
   972 
  1009   $(eval $(call SetupNativeCompilation, BUILD_LIBAWT_LWAWT, \
   973   $(eval $(call SetupJdkLibrary, BUILD_LIBAWT_LWAWT, \
  1010       NAME := awt_lwawt, \
   974       NAME := awt_lwawt, \
  1011       OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
       
  1012       SRC := $(LIBAWT_LWAWT_DIRS), \
   975       SRC := $(LIBAWT_LWAWT_DIRS), \
  1013       INCLUDE_FILES := $(LIBAWT_LWAWT_FILES), \
   976       INCLUDE_FILES := $(LIBAWT_LWAWT_FILES), \
  1014       EXCLUDE_FILES := $(LIBAWT_LWAWT_EXFILES), \
   977       EXCLUDE_FILES := $(LIBAWT_LWAWT_EXFILES), \
  1015       EXCLUDES := $(LIBAWT_LWAWT_EXCLUDES), \
   978       EXCLUDES := $(LIBAWT_LWAWT_EXCLUDES), \
  1016       OPTIMIZATION := LOW, \
   979       OPTIMIZATION := LOW, \
  1034           -framework ExceptionHandling \
   997           -framework ExceptionHandling \
  1035           -framework JavaNativeFoundation \
   998           -framework JavaNativeFoundation \
  1036           -framework JavaRuntimeSupport \
   999           -framework JavaRuntimeSupport \
  1037           -framework OpenGL \
  1000           -framework OpenGL \
  1038           -framework QuartzCore -ljava, \
  1001           -framework QuartzCore -ljava, \
  1039       OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libawt_lwawt, \
       
  1040   ))
  1002   ))
  1041 
  1003 
  1042   TARGETS += $(BUILD_LIBAWT_LWAWT)
  1004   TARGETS += $(BUILD_LIBAWT_LWAWT)
  1043 
  1005 
  1044   $(BUILD_LIBAWT_LWAWT): $(BUILD_LIBAWT)
  1006   $(BUILD_LIBAWT_LWAWT): $(BUILD_LIBAWT)
  1053 
  1015 
  1054 ################################################################################
  1016 ################################################################################
  1055 
  1017 
  1056 ifeq ($(OPENJDK_TARGET_OS), macosx)
  1018 ifeq ($(OPENJDK_TARGET_OS), macosx)
  1057 
  1019 
  1058   $(eval $(call SetupNativeCompilation, BUILD_LIBOSXUI, \
  1020   $(eval $(call SetupJdkLibrary, BUILD_LIBOSXUI, \
  1059       NAME := osxui, \
  1021       NAME := osxui, \
  1060       OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
       
  1061       SRC := $(TOPDIR)/src/java.desktop/macosx/native/libosxui, \
  1022       SRC := $(TOPDIR)/src/java.desktop/macosx/native/libosxui, \
  1062       OPTIMIZATION := LOW, \
  1023       OPTIMIZATION := LOW, \
  1063       CFLAGS := $(CFLAGS_JDKLIB) \
  1024       CFLAGS := $(CFLAGS_JDKLIB) \
  1064           -I$(TOPDIR)/src/java.desktop/macosx/native/libosxui \
  1025           -I$(TOPDIR)/src/java.desktop/macosx/native/libosxui \
  1065           -I$(TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/awt \
  1026           -I$(TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/awt \
  1076           -framework Carbon \
  1037           -framework Carbon \
  1077           -framework ApplicationServices \
  1038           -framework ApplicationServices \
  1078           -framework JavaNativeFoundation \
  1039           -framework JavaNativeFoundation \
  1079           -framework JavaRuntimeSupport \
  1040           -framework JavaRuntimeSupport \
  1080           -ljava -ljvm, \
  1041           -ljava -ljvm, \
  1081       OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libosxui, \
       
  1082   ))
  1042   ))
  1083 
  1043 
  1084   TARGETS += $(BUILD_LIBOSXUI)
  1044   TARGETS += $(BUILD_LIBOSXUI)
  1085 
  1045 
  1086   $(BUILD_LIBOSXUI): $(BUILD_LIBAWT)
  1046   $(BUILD_LIBOSXUI): $(BUILD_LIBAWT)