jdk/make/lib/Awt2dLibraries.gmk
changeset 25859 3317bb8137f4
parent 25563 248400a88627
child 25993 3684a086e999
equal deleted inserted replaced
25858:836adbf7a2cd 25859:3317bb8137f4
    28 
    28 
    29 WIN_AWT_LIB := $(JDK_OUTPUTDIR)/objs/libawt/awt.lib
    29 WIN_AWT_LIB := $(JDK_OUTPUTDIR)/objs/libawt/awt.lib
    30 
    30 
    31 ##########################################################################################
    31 ##########################################################################################
    32 
    32 
    33 BUILD_LIBMLIB_SRC := $(JDK_TOPDIR)/src/share/native/sun/awt/medialib
    33 BUILD_LIBMLIB_SRC := $(JDK_TOPDIR)/src/java.desktop/share/native/libmlib_image \
       
    34     $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/medialib
    34 BUILD_LIBMLIB_CFLAGS := -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES \
    35 BUILD_LIBMLIB_CFLAGS := -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES \
    35     -I$(BUILD_LIBMLIB_SRC) \
    36     $(addprefix -I, $(BUILD_LIBMLIB_SRC)) \
    36     -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/medialib
    37     -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libmlib_image
    37 
    38 
    38 BUILD_LIBMLIB_LDLIBS :=
    39 BUILD_LIBMLIB_LDLIBS :=
    39 BUILD_LIBMLIB_IMAGE_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libmlib_image/mapfile-vers
    40 BUILD_LIBMLIB_IMAGE_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libmlib_image/mapfile-vers
    40 
    41 
    41 BUILD_LIBMLIB_CFLAGS += -DMLIB_NO_LIBSUNMATH
    42 BUILD_LIBMLIB_CFLAGS += -DMLIB_NO_LIBSUNMATH
    50 
    51 
    51 $(eval $(call SetupNativeCompilation,BUILD_LIBMLIB_IMAGE, \
    52 $(eval $(call SetupNativeCompilation,BUILD_LIBMLIB_IMAGE, \
    52     LIBRARY := mlib_image, \
    53     LIBRARY := mlib_image, \
    53     OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
    54     OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
    54     SRC := $(BUILD_LIBMLIB_SRC), \
    55     SRC := $(BUILD_LIBMLIB_SRC), \
    55     EXCLUDE_FILES := awt_ImagingLib.c mlib_c_ImageBlendTable.c, \
    56     EXCLUDE_FILES := mlib_c_ImageBlendTable.c, \
    56     LANG := C, \
    57     LANG := C, \
    57     OPTIMIZATION := HIGHEST, \
    58     OPTIMIZATION := HIGHEST, \
    58     CFLAGS := $(CFLAGS_JDKLIB) \
    59     CFLAGS := $(CFLAGS_JDKLIB) \
    59         $(BUILD_LIBMLIB_CFLAGS), \
    60         $(BUILD_LIBMLIB_CFLAGS), \
    60     MAPFILE := $(BUILD_LIBMLIB_IMAGE_MAPFILE), \
    61     MAPFILE := $(BUILD_LIBMLIB_IMAGE_MAPFILE), \
    61     LDFLAGS := $(LDFLAGS_JDKLIB) \
    62     LDFLAGS := $(LDFLAGS_JDKLIB) \
    62         $(call SET_SHARED_LIBRARY_ORIGIN), \
    63         $(call SET_SHARED_LIBRARY_ORIGIN), \
    63     LDFLAGS_SUFFIX := $(BUILD_LIBMLIB_LDLIBS) \
    64     LDFLAGS_SUFFIX := $(BUILD_LIBMLIB_LDLIBS) \
    64         $(LDFLAGS_JDKLIB_SUFFIX), \
    65         $(LDFLAGS_JDKLIB_SUFFIX), \
    65     LDFLAGS_SUFFIX_solaris := -lc, \
    66     LDFLAGS_SUFFIX_solaris := -lc, \
    66     VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
    67     VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
    67     RC_FLAGS := $(RC_FLAGS) \
    68     RC_FLAGS := $(RC_FLAGS) \
    68         -D "JDK_FNAME=mlib_image.dll" \
    69         -D "JDK_FNAME=mlib_image.dll" \
    69         -D "JDK_INTERNAL_NAME=mlib_image" \
    70         -D "JDK_INTERNAL_NAME=mlib_image" \
    70         -D "JDK_FTYPE=0x2L", \
    71         -D "JDK_FTYPE=0x2L", \
    71     OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libmlib_image, \
    72     OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libmlib_image, \
    72     DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
    73     DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
    73 
    74 
    74 $(BUILD_LIBMLIB_IMAGE): $(BUILD_LIBJAVA)
    75 $(BUILD_LIBMLIB_IMAGE): $(BUILD_LIBJAVA)
    75 
    76 
    76 BUILD_LIBRARIES += $(BUILD_LIBMLIB_IMAGE)
    77 DESKTOP_LIBRARIES += $(BUILD_LIBMLIB_IMAGE)
    77 
    78 
    78 ##########################################################################################
    79 ##########################################################################################
    79 
    80 
    80 ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc)
    81 ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc)
    81 
    82 
    82   BUILD_LIBMLIB_IMAGE_V_FILES := \
    83   LIBMLIB_IMAGE_V_SRC := $(JDK_TOPDIR)/src/java.desktop/share/native/libmlib_image \
    83       mlib_v_ImageLookUp.c \
    84       $(JDK_TOPDIR)/src/java.desktop/unix/native/libmlib_image \
    84       mlib_ImageCreate.c \
    85       $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/medialib \
    85       mlib_ImageAffine.c \
    86       $(JDK_TOPDIR)/src/java.desktop/unix/native/common/sun/awt/medialib \
    86       mlib_ImageConvMxN.c \
    87       #
    87       mlib_ImageConvKernelConvert.c \
    88   LIBMLIB_IMAGE_V_CFLAGS := $(JDK_TOPDIR)/src/java.desktop/unix/native/libmlib_image/vis_$(OPENJDK_TARGET_CPU_BITS).il \
    88       mlib_sys.c \
    89       $(addprefix -I, $(LIBMLIB_IMAGE_V_SRC)) \
    89       mlib_ImageLookUp_64.c \
    90       #
    90       mlib_ImageLookUp_Bit.c \
    91 
    91       mlib_ImageColorTrue2Index.c \
    92   BUILD_LIBMLIB_IMAGE_V_EXFILES := \
    92       mlib_c_ImageThresh1_U8.c \
    93       awt_ImagingLib.c \
    93       mlib_v_ImageLookUpS16S16Func.c \
    94       mlib_c_ImageAffine_BC.c \
    94       mlib_v_ImageLookUpS16S32Func.c \
    95       mlib_c_ImageAffine_BC_S16.c \
    95       mlib_v_ImageLookUpS16U16Func.c \
    96       mlib_c_ImageAffine_BC_U16.c \
    96       mlib_v_ImageLookUpS16U8Func.c \
    97       mlib_c_ImageAffine_BL.c \
    97       mlib_v_ImageLookUpS32S16Func.c \
    98       mlib_c_ImageAffine_BL_S16.c \
    98       mlib_v_ImageLookUpS32S32Func.c \
    99       mlib_c_ImageAffine_BL_U16.c \
    99       mlib_v_ImageLookUpS32U16Func.c \
   100       mlib_c_ImageAffineIndex_BC.c \
   100       mlib_v_ImageLookUpS32U8Func.c \
   101       mlib_c_ImageAffineIndex_BL.c \
   101       mlib_v_ImageLookUpSIS16S16Func.c \
   102       mlib_c_ImageAffine_NN.c \
   102       mlib_v_ImageLookUpSIS16S32Func.c \
   103       mlib_c_ImageBlendTable.c \
   103       mlib_v_ImageLookUpSIS16U16Func.c \
   104       mlib_c_ImageConvClearEdge.c \
   104       mlib_v_ImageLookUpSIS16U8Func.c \
   105       mlib_c_ImageConvCopyEdge.c \
   105       mlib_v_ImageLookUpSIS32S16Func.c \
   106       mlib_c_ImageConv_f.c \
   106       mlib_v_ImageLookUpSIS32S32Func.c \
   107       mlib_c_ImageConvVersion.c \
   107       mlib_v_ImageLookUpSIS32U16Func.c \
   108       mlib_c_ImageCopy.c \
   108       mlib_v_ImageLookUpSIS32U8Func.c \
   109       mlib_c_ImageLookUp.c \
   109       mlib_v_ImageLookUpSIU16S16Func.c \
   110       mlib_c_ImageLookUp_f.c \
   110       mlib_v_ImageLookUpSIU16S32Func.c \
   111       mlib_v_ImageChannelExtract.c \
   111       mlib_v_ImageLookUpSIU16U16Func.c \
   112       mlib_v_ImageChannelExtract_f.c \
   112       mlib_v_ImageLookUpSIU16U8Func.c \
   113       mlib_v_ImageChannelInsert_34.c \
   113       mlib_v_ImageLookUpSIU8S16Func.c \
   114       mlib_v_ImageChannelInsert.c \
   114       mlib_v_ImageLookUpSIU8S32Func.c \
   115       mlib_v_ImageConvIndex3_8_16nw.c \
   115       mlib_v_ImageLookUpSIU8U16Func.c \
   116       mlib_v_ImageConvIndex3_8_8nw.c \
   116       mlib_v_ImageLookUpSIU8U8Func.c \
   117       mlib_v_ImageCopy.c \
   117       mlib_v_ImageLookUpU16S16Func.c \
   118       mlib_v_ImageCopy_blk.s \
   118       mlib_v_ImageLookUpU16S32Func.c \
   119       #
   119       mlib_v_ImageLookUpU16U16Func.c \
   120 
   120       mlib_v_ImageLookUpU16U8Func.c \
   121   LIBMLIB_IMAGE_V_CFLAGS += $(filter-out -DMLIB_NO_LIBSUNMATH, $(BUILD_LIBMLIB_CFLAGS))
   121       mlib_v_ImageLookUpU8S16Func.c \
       
   122       mlib_v_ImageLookUpU8S32Func.c \
       
   123       mlib_v_ImageLookUpU8U16Func.c \
       
   124       mlib_v_ImageLookUpU8U8Func.c \
       
   125       mlib_v_ImageAffineIndex_BC.c \
       
   126       mlib_v_ImageAffine_BC.c \
       
   127       mlib_v_ImageAffine_BC_S16.c \
       
   128       mlib_v_ImageAffine_BC_U16.c \
       
   129       mlib_v_ImageAffine_BL.c \
       
   130       mlib_v_ImageAffine_BL_S16.c \
       
   131       mlib_v_ImageAffine_BL_U16.c \
       
   132       mlib_v_ImageAffine_NN.c \
       
   133       mlib_v_ImageFilters.c \
       
   134       mlib_ImageAffineEdge.c \
       
   135       mlib_ImageAffine_BC_D64.c \
       
   136       mlib_ImageAffine_BC_F32.c \
       
   137       mlib_ImageAffine_BC_S32.c \
       
   138       mlib_ImageAffine_BL_D64.c \
       
   139       mlib_ImageAffine_BL_F32.c \
       
   140       mlib_ImageAffine_BL_S32.c \
       
   141       mlib_ImageAffine_NN.c \
       
   142       mlib_ImageAffine_NN_Bit.c \
       
   143       mlib_ImageFilters.c \
       
   144       mlib_ImageScanPoly.c \
       
   145       mlib_ImageConv_8nw.c \
       
   146       mlib_ImageConv_8ext.c \
       
   147       mlib_ImageConv_16nw.c \
       
   148       mlib_ImageConv_16ext.c \
       
   149       mlib_ImageConv_u16nw.c \
       
   150       mlib_ImageConv_u16ext.c \
       
   151       mlib_ImageConv_32nw.c \
       
   152       mlib_ImageConv_F32nw.c \
       
   153       mlib_ImageConvMxN_Fp.c \
       
   154       mlib_ImageConvMxN_ext.c \
       
   155       mlib_ImageConv_D64nw.c \
       
   156       mlib_ImageClipping.c \
       
   157       mlib_ImageConvCopyEdge_Bit.c \
       
   158       mlib_ImageConvClearEdge_Bit.c \
       
   159       mlib_ImageConv2x2_f.c \
       
   160       mlib_ImageConvClearEdge_Fp.c \
       
   161       mlib_v_ImageConvMxN_8.c \
       
   162       mlib_v_ImageConvClearEdge.c \
       
   163       mlib_v_ImageConvCopyEdge.c \
       
   164       mlib_v_ImageConvMxN_8ext.c \
       
   165       mlib_v_ImageConvVersion.c \
       
   166       mlib_v_ImageConv_8nw.c \
       
   167       mlib_ImageConvCopyEdge_Fp.c \
       
   168       mlib_v_ImageChannelInsert_1.c \
       
   169       mlib_v_ImageChannelExtract_43.c \
       
   170       mlib_v_ImageChannelExtract_1.c \
       
   171       mlib_ImageCopy_Bit.c \
       
   172       mlib_v_ImageCopy_f.c \
       
   173       mlib_ImageUtils.c \
       
   174       mlib_ImageDivTables.c
       
   175 
       
   176   BUILD_LIBMLIB_V_CFLAGS := $(filter-out -DMLIB_NO_LIBSUNMATH, $(BUILD_LIBMLIB_CFLAGS))
       
   177 
   122 
   178   $(eval $(call SetupNativeCompilation,BUILD_LIBMLIB_IMAGE_V, \
   123   $(eval $(call SetupNativeCompilation,BUILD_LIBMLIB_IMAGE_V, \
   179       LIBRARY := mlib_image_v, \
   124       LIBRARY := mlib_image_v, \
   180       OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
   125       OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
   181       SRC := $(JDK_TOPDIR)/src/share/native/sun/awt/medialib \
   126       SRC := $(LIBMLIB_IMAGE_V_SRC), \
   182           $(JDK_TOPDIR)/src/solaris/native/sun/awt/medialib, \
       
   183       LANG := C, \
   127       LANG := C, \
   184       INCLUDE_FILES := $(BUILD_LIBMLIB_IMAGE_V_FILES), \
   128       EXCLUDE_FILES := $(BUILD_LIBMLIB_IMAGE_V_EXFILES), \
   185       OPTIMIZATION := HIGHEST, \
   129       OPTIMIZATION := HIGHEST, \
   186       CFLAGS := -xarch=sparcvis \
   130       CFLAGS := -xarch=sparcvis \
   187           $(JDK_TOPDIR)/src/solaris/native/sun/awt/medialib/vis_$(OPENJDK_TARGET_CPU_BITS).il \
   131           $(LIBMLIB_IMAGE_V_CFLAGS) \
   188           $(BUILD_LIBMLIB_V_CFLAGS) \
       
   189           $(CFLAGS_JDKLIB), \
   132           $(CFLAGS_JDKLIB), \
   190       MAPFILE := $(BUILD_LIBMLIB_IMAGE_MAPFILE), \
   133       MAPFILE := $(BUILD_LIBMLIB_IMAGE_MAPFILE), \
   191       LDFLAGS := $(LDFLAGS_JDKLIB) \
   134       LDFLAGS := $(LDFLAGS_JDKLIB) \
   192           $(BUILD_LIBMLIB_LDLIBS) -ljava -ljvm \
   135           $(BUILD_LIBMLIB_LDLIBS) -ljava -ljvm \
   193           $(call SET_SHARED_LIBRARY_ORIGIN), \
   136           $(call SET_SHARED_LIBRARY_ORIGIN), \
   195       OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libmlib_image_v, \
   138       OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libmlib_image_v, \
   196       DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
   139       DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
   197 
   140 
   198   $(BUILD_LIBMLIB_IMAGE_V): $(BUILD_LIBJAVA)
   141   $(BUILD_LIBMLIB_IMAGE_V): $(BUILD_LIBJAVA)
   199 
   142 
   200   BUILD_LIBRARIES += $(BUILD_LIBMLIB_IMAGE_V)
   143   DESKTOP_LIBRARIES += $(BUILD_LIBMLIB_IMAGE_V)
   201 
   144 
   202 endif
   145 endif
   203 
   146 
   204 ##########################################################################################
   147 ##########################################################################################
   205 
   148 
   206 LIBAWT_DIRS := \
   149 LIBAWT_DIRS := $(JDK_TOPDIR)/src/java.desktop/share/native/libawt \
   207     $(JDK_TOPDIR)/src/share/native/sun/awt \
   150     $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt \
   208     $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt \
   151     $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/debug \
   209     $(JDK_TOPDIR)/src/share/native/sun/awt/image \
   152     $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/awt \
   210     $(JDK_TOPDIR)/src/share/native/sun/awt/image/gif \
   153     #
   211     $(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
       
   212     $(JDK_TOPDIR)/src/share/native/sun/awt/medialib \
       
   213     $(JDK_TOPDIR)/src/share/native/sun/awt/debug \
       
   214     $(JDK_TOPDIR)/src/share/native/sun/awt/utility \
       
   215     $(JDK_TOPDIR)/src/share/native/sun/java2d \
       
   216     $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d \
       
   217     $(JDK_TOPDIR)/src/share/native/sun/java2d/loops \
       
   218     $(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \
       
   219     $(JDK_TOPDIR)/src/share/native/sun/awt/image \
       
   220     $(JDK_TOPDIR)/src/share/native/sun/java2d/opengl \
       
   221     $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/opengl \
       
   222     $(JDK_TOPDIR)/src/share/native/sun/font
       
   223 
   154 
   224 ifeq ($(OPENJDK_TARGET_OS), windows)
   155 ifeq ($(OPENJDK_TARGET_OS), windows)
   225   LIBAWT_DIRS += \
   156   LIBAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/utility
   226       $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/windows \
   157 else
   227       $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/windows \
   158   LIBAWT_EXFILES := sun/java2d/ShaderList.c
   228       $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/d3d
   159 endif
   229 else ifneq ($(OPENJDK_TARGET_OS), macosx)
   160 
   230   LIBAWT_DIRS += \
   161 ifneq ($(filter $(OPENJDK_TARGET_OS), solaris linux macosx), )
   231       $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/x11
   162   LIBAWT_EXFILES += awt_Font.c CUPSfuncs.c fontpath.c X11Color.c
   232 endif
   163 endif
   233 
   164 
   234 ifeq ($(OPENJDK_TARGET_OS), aix)
   165 ifeq ($(OPENJDK_TARGET_OS), macosx)
   235   LIBAWT_DIRS += $(JDK_TOPDIR)/src/aix/porting
   166   LIBAWT_EXFILES += initIDs.c sun/awt/image/cvutils/img_colors.c
   236 endif
   167 endif
       
   168 
       
   169 LIBAWT_CFLAGS += -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \
       
   170     $(addprefix -I, $(shell find $(LIBAWT_DIRS) -type d)) \
       
   171     -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/awt \
       
   172     $(LIBJAVA_HEADER_FLAGS) \
       
   173     $(addprefix -I, $(BUILD_LIBMLIB_IMAGE_SRC)) \
       
   174     #
   237 
   175 
   238 LIBAWT_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES \
   176 LIBAWT_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES \
   239     $(X_CFLAGS) \
   177     $(X_CFLAGS) \
   240     $(foreach dir, $(LIBAWT_DIRS), -I$(dir))
   178     $(foreach dir, $(LIBAWT_DIRS), -I$(dir))
   241 
   179 
   242 LIBAWT_FILES := \
       
   243     gifdecoder.c \
       
   244     imageInitIDs.c \
       
   245     img_globals.c \
       
   246     SurfaceData.c \
       
   247     Region.c \
       
   248     BufImgSurfaceData.c \
       
   249     Disposer.c \
       
   250     Trace.c \
       
   251     GraphicsPrimitiveMgr.c \
       
   252     Blit.c \
       
   253     BlitBg.c \
       
   254     ScaledBlit.c \
       
   255     FillRect.c \
       
   256     FillSpans.c \
       
   257     FillParallelogram.c \
       
   258     DrawParallelogram.c \
       
   259     DrawLine.c \
       
   260     DrawRect.c \
       
   261     DrawPolygons.c \
       
   262     DrawPath.c \
       
   263     FillPath.c \
       
   264     ProcessPath.c \
       
   265     MaskBlit.c \
       
   266     MaskFill.c \
       
   267     TransformHelper.c \
       
   268     AlphaMath.c \
       
   269     AlphaMacros.c \
       
   270     AnyByte.c \
       
   271     ByteBinary1Bit.c \
       
   272     ByteBinary2Bit.c \
       
   273     ByteBinary4Bit.c \
       
   274     ByteIndexed.c \
       
   275     ByteGray.c \
       
   276     Index8Gray.c \
       
   277     Index12Gray.c \
       
   278     AnyShort.c \
       
   279     Ushort555Rgb.c \
       
   280     Ushort565Rgb.c \
       
   281     Ushort4444Argb.c \
       
   282     Ushort555Rgbx.c \
       
   283     UshortGray.c \
       
   284     UshortIndexed.c \
       
   285     Any3Byte.c \
       
   286     ThreeByteBgr.c \
       
   287     AnyInt.c \
       
   288     IntArgb.c \
       
   289     IntArgbPre.c \
       
   290     IntArgbBm.c \
       
   291     IntRgb.c \
       
   292     IntBgr.c \
       
   293     IntRgbx.c \
       
   294     Any4Byte.c \
       
   295     FourByteAbgr.c \
       
   296     FourByteAbgrPre.c \
       
   297     BufferedMaskBlit.c \
       
   298     BufferedRenderPipe.c \
       
   299     ShapeSpanIterator.c \
       
   300     SpanClipRenderer.c \
       
   301     awt_ImageRep.c \
       
   302     awt_ImagingLib.c \
       
   303     awt_Mlib.c \
       
   304     awt_parseImage.c \
       
   305     DataBufferNative.c \
       
   306     dither.c \
       
   307     debug_assert.c \
       
   308     debug_mem.c \
       
   309     debug_trace.c \
       
   310     debug_util.c
       
   311 
       
   312 ifneq (, $(filter $(OPENJDK_TARGET_OS), solaris linux aix))
       
   313   LIBAWT_FILES += awt_LoadLibrary.c initIDs.c img_colors.c
       
   314 endif
       
   315 
       
   316 ifeq ($(OPENJDK_TARGET_OS), aix)
       
   317   LIBAWT_FILES += porting_aix.c
       
   318 endif
       
   319 
       
   320 ifeq ($(OPENJDK_TARGET_OS), macosx)
   180 ifeq ($(OPENJDK_TARGET_OS), macosx)
   321   LIBAWT_FILES += awt_LoadLibrary.c
       
   322 endif
   181 endif
   323 
   182 
   324 ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc)
   183 ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc)
   325   LIBAWT_CFLAGS += -DMLIB_ADD_SUFF
   184   LIBAWT_CFLAGS += -DMLIB_ADD_SUFF
   326   LIBAWT_CFLAGS += -xarch=sparcvis
   185   LIBAWT_CFLAGS += -xarch=sparcvis
   327   LIBAWT_CFLAGS += $(JDK_TOPDIR)/src/solaris/native/sun/awt/medialib/vis_$(OPENJDK_TARGET_CPU_BITS).il
   186 
   328   LIBAWT_CFLAGS += \
   187   LIBAWT_CFLAGS += $(JDK_TOPDIR)/src/java.desktop/unix/native/libmlib_image/vis_$(OPENJDK_TARGET_CPU_BITS).il
   329       -I$(JDK_TOPDIR)/src/solaris/native/sun/awt/medialib \
   188   LIBAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/medialib
   330       -I$(JDK_TOPDIR)/src/solaris/native/sun/java2d/medialib \
   189   LIBAWT_EXFILES += sun/java2d/loops/MapAccelFunc.c
   331       -I$(JDK_TOPDIR)/src/solaris/native/sun/java2d/loops
       
   332 
       
   333   LIBAWT_DIRS += $(JDK_TOPDIR)/src/solaris/native/sun/awt/medialib \
       
   334       $(JDK_TOPDIR)/src/solaris/native/sun/java2d/loops
       
   335 
       
   336   LIBAWT_FILES += \
       
   337       vis_FuncArray.c \
       
   338       java2d_Mlib.c \
       
   339       mlib_ImageCreate.c \
       
   340       mlib_ImageZoom_NN.c \
       
   341       mlib_ImageCopy_Bit.c \
       
   342       mlib_sys.c \
       
   343       mlib_v_ImageClear.c \
       
   344       mlib_v_ImageClear_f.c \
       
   345       mlib_v_ImageConstXor.c \
       
   346       mlib_v_ImageCopy.c \
       
   347       mlib_v_ImageCopy_f.c \
       
   348       mlib_v_ImageXor.c \
       
   349       mlib_v_ImageZoom_NN_f.c \
       
   350       vis_Interp.c \
       
   351       vis_AlphaMacros.c \
       
   352       vis_AlphaMaskBlit.c \
       
   353       vis_AlphaMaskFill.c \
       
   354       vis_ByteGray.c \
       
   355       vis_ByteGray_FromRgb.c \
       
   356       vis_ByteGray_Mask.c \
       
   357       vis_ByteIndexed.c \
       
   358       vis_DrawLine.c \
       
   359       vis_FourByteAbgr.c \
       
   360       vis_IntArgb.c \
       
   361       vis_IntArgbPre.c \
       
   362       vis_IntArgbPre_Mask.c \
       
   363       vis_IntBgr.c \
       
   364       vis_IntRgb.c \
       
   365       vis_IntRgbx.c \
       
   366       vis_SrcMaskFill.c \
       
   367       vis_SrcOverMaskBlit.c \
       
   368       vis_SrcOverMaskFill.c \
       
   369       vis_FourByteAbgrPre.c \
       
   370       vis_GlyphList.c \
       
   371       vis_GlyphListXor.c \
       
   372       vis_IntArgbBm.c \
       
   373       vis_ThreeByteBgr.c \
       
   374       vis_UshortGray.c \
       
   375       vis_UshortGray_FromRgb.c \
       
   376       vis_XorBlit.c \
       
   377       mlib_v_ImageCopy_blk.s
       
   378 
   190 
   379   ifeq ($(OPENJDK_TARGET_CPU), sparcv9)
   191   ifeq ($(OPENJDK_TARGET_CPU), sparcv9)
   380     LIBAWT_ASFLAGS = -P -xarch=v9a
   192     LIBAWT_ASFLAGS = -P -xarch=v9a
   381   else
   193   else
   382     LIBAWT_ASFLAGS = -P -xarch=v8plusa
   194     LIBAWT_ASFLAGS = -P -xarch=v8plusa
   383   endif
   195   endif
   384 else
   196 else
   385   LIBAWT_FILES += MapAccelFunc.c
   197   LIBAWT_EXCLUDES += \
       
   198       $(JDK_TOPDIR)/src/java.desktop/unix/native/libawt/sun/awt/medialib \
       
   199       $(JDK_TOPDIR)/src/java.desktop/unix/native/libawt/sun/java2d/loops \
       
   200       $(JDK_TOPDIR)/src/java.desktop/unix/native/common/sun/awt/medialib \
       
   201       #
   386 endif
   202 endif
   387 
   203 
   388 ifneq ($(OPENJDK_TARGET_OS), solaris)
   204 ifneq ($(OPENJDK_TARGET_OS), solaris)
   389   LIBAWT_CFLAGS += -DMLIB_NO_LIBSUNMATH
   205   LIBAWT_CFLAGS += -DMLIB_NO_LIBSUNMATH
   390 endif
   206 endif
   391 
   207 
   392 LIBAWT_LANG := C
   208 LIBAWT_LANG := C
   393 
   209 
   394 ifeq ($(OPENJDK_TARGET_OS), windows)
   210 ifeq ($(OPENJDK_TARGET_OS), windows)
   395   LIBAWT_FILES += AccelGlyphCache.c \
   211   LIBAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/font \
   396       ShaderList.c \
   212       $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/java2d/opengl \
   397       CmdIDList.cpp \
   213   # Why does libawt need java.base headers?
   398       Hashtable.cpp \
   214   LIBAWT_CFLAGS += -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/font \
   399       GDIHashtable.cpp \
   215       -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/java2d/opengl \
   400       Devices.cpp \
   216       -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/java2d/opengl \
   401       ObjectList.cpp \
   217       -I$(JDK_TOPDIR)/src/java.desktop/windows/native/include \
   402       GDIBlitLoops.cpp \
   218       -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \
   403       GDIRenderer.cpp \
   219       -I$(JDK_OUTPUTDIR)/gensrc_headers/java.base \
   404       GDIWindowSurfaceData.cpp \
   220       #
   405       WindowsFlags.cpp \
   221   LIBAWT_EXFILES += \
   406       WPrinterJob.cpp \
   222       sun/java2d/d3d/D3DPipeline.cpp \
   407       awt_%.cpp \
   223       sun/java2d/d3d/D3DShaderGen.c \
   408       D3DBlitLoops.cpp \
   224       sun/awt/image/cvutils/img_colors.c \
   409       D3DBufImgOps.cpp \
   225       sun/windows/WBufferStrategy.cpp \
   410       D3DContext.cpp \
   226       #
   411       D3DGlyphCache.cpp \
       
   412       D3DGraphicsDevice.cpp \
       
   413       D3DMaskBlit.cpp \
       
   414       D3DMaskCache.cpp \
       
   415       D3DMaskFill.cpp \
       
   416       D3DPipelineManager.cpp \
       
   417       D3DPaints.cpp \
       
   418       D3DRenderer.cpp \
       
   419       D3DRenderQueue.cpp \
       
   420       D3DResourceManager.cpp \
       
   421       D3DSurfaceData.cpp \
       
   422       D3DTextRenderer.cpp \
       
   423       D3DVertexCacher.cpp \
       
   424       ShellFolder2.cpp \
       
   425       ThemeReader.cpp \
       
   426       ComCtl32Util.cpp \
       
   427       DllUtil.cpp \
       
   428       initIDs.cpp \
       
   429       MouseInfo.cpp \
       
   430       rect.c \
       
   431       OGLBlitLoops.c \
       
   432       OGLBufImgOps.c \
       
   433       OGLContext.c \
       
   434       OGLFuncs.c \
       
   435       OGLMaskBlit.c \
       
   436       OGLMaskFill.c \
       
   437       OGLPaints.c \
       
   438       OGLRenderQueue.c \
       
   439       OGLRenderer.c \
       
   440       OGLSurfaceData.c \
       
   441       OGLTextRenderer.c \
       
   442       OGLVertexCache.c \
       
   443       WGLGraphicsConfig.c \
       
   444       WGLSurfaceData.c
       
   445 
   227 
   446   LIBAWT_LANG := C++
   228   LIBAWT_LANG := C++
   447   LIBAWT_CFLAGS += -EHsc -DUNICODE -D_UNICODE
   229   LIBAWT_CFLAGS += -EHsc -DUNICODE -D_UNICODE
   448   ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
   230   ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
   449     LIBAWT_CFLAGS += -DMLIB_OS64BIT
   231     LIBAWT_CFLAGS += -DMLIB_OS64BIT
   450   endif
   232   endif
   451 
   233 
   452   ifdef OPENJDK
   234   ifdef OPENJDK
   453     LIBAWT_RC_FLAGS := -i "$(JDK_TOPDIR)/src/windows/resource/icons"
   235     LIBAWT_RC_FLAGS := -i "$(JDK_TOPDIR)/src/java.base/windows/native/launcher/icons"
   454   else
   236   else
   455     LIBAWT_RC_FLAGS := -i "$(JDK_TOPDIR)/src/closed/windows/native/sun/windows"
   237     LIBAWT_RC_FLAGS := -i "$(JDK_TOPDIR)/src/closed/java.base/windows/native/launcher/icons"
   456   endif
   238   endif
   457   LIBAWT_VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/native/sun/windows/awt.rc
   239   LIBAWT_VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/java.desktop/windows/native/libawt/sun/windows/awt.rc
   458 endif
   240 endif
   459 
   241 
   460 ifeq ($(MILESTONE), internal)
   242 ifeq ($(MILESTONE), internal)
   461   LIBAWT_CFLAGS += -DINTERNAL_BUILD
   243   LIBAWT_CFLAGS += -DINTERNAL_BUILD
   462 endif
   244 endif
   468 
   250 
   469 $(eval $(call SetupNativeCompilation,BUILD_LIBAWT, \
   251 $(eval $(call SetupNativeCompilation,BUILD_LIBAWT, \
   470     LIBRARY := awt, \
   252     LIBRARY := awt, \
   471     OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
   253     OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
   472     SRC := $(LIBAWT_DIRS), \
   254     SRC := $(LIBAWT_DIRS), \
   473     INCLUDE_FILES := $(LIBAWT_FILES), \
   255     EXCLUDES := $(LIBAWT_EXCLUDES), \
       
   256     EXCLUDE_FILES := $(LIBAWT_EXFILES), \
   474     LANG := $(LIBAWT_LANG), \
   257     LANG := $(LIBAWT_LANG), \
   475     OPTIMIZATION := LOW, \
   258     OPTIMIZATION := LOW, \
   476     CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_CFLAGS), \
   259     CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_CFLAGS), \
   477     ASFLAGS := $(LIBAWT_ASFLAGS), \
   260     ASFLAGS := $(LIBAWT_ASFLAGS), \
   478     MAPFILE := $(LIBAWT_MAPFILE), \
   261     MAPFILE := $(LIBAWT_MAPFILE), \
   509 
   292 
   510 ifeq ($(OPENJDK_TARGET_OS), macosx)
   293 ifeq ($(OPENJDK_TARGET_OS), macosx)
   511   $(BUILD_LIBAWT): $(BUILD_LIBMLIB_IMAGE)
   294   $(BUILD_LIBAWT): $(BUILD_LIBMLIB_IMAGE)
   512 endif
   295 endif
   513 
   296 
   514 BUILD_LIBRARIES += $(BUILD_LIBAWT)
   297 DESKTOP_LIBRARIES += $(BUILD_LIBAWT)
   515 
   298 
   516 ##########################################################################################
   299 ##########################################################################################
   517 
   300 
   518 ifeq ($(findstring $(OPENJDK_TARGET_OS),windows macosx),)
   301 ifeq ($(findstring $(OPENJDK_TARGET_OS),windows macosx),)
   519   ifndef BUILD_HEADLESS_ONLY
   302   ifndef BUILD_HEADLESS_ONLY
   520 
   303 
   521     LIBAWT_XAWT_DIRS := \
   304     LIBAWT_XAWT_DIRS := \
   522         $(JDK_TOPDIR)/src/share/native/sun/awt/debug \
   305         $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt_xawt \
   523         $(JDK_TOPDIR)/src/share/native/sun/awt/utility \
   306         $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libjawt \
   524         $(JDK_TOPDIR)/src/share/native/sun/font \
   307         $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/debug \
   525         $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/font \
   308         $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/utility \
   526         $(JDK_TOPDIR)/src/share/native/sun/java2d/opengl \
   309         $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/font \
   527         $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt \
   310         $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/java2d/opengl \
   528         $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/opengl \
   311         $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/java2d/opengl \
   529         $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/x11 \
   312         $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/java2d/x11 \
   530         $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/xawt \
   313         $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/awt \
   531 
   314         #
   532     LIBAWT_XAWT_CFLAGS := -DXAWT -DXAWT_HACK \
   315 
       
   316     LIBAWT_XAWT_EXCLUDES := medialib
       
   317 
       
   318     LIBAWT_XAWT_CFLAGS := $(addprefix -I, $(shell $(FIND) $(LIBAWT_XAWT_DIRS) -type d)) \
       
   319         -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \
       
   320         -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \
       
   321         -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/include \
       
   322         -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/include \
       
   323         -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d \
       
   324         -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt/sun/java2d \
       
   325         -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d/loops \
       
   326         -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d/pipe \
       
   327         -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/awt/image/cvutils \
       
   328         -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/awt/image \
       
   329         -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libsunwjdga \
       
   330         -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/font \
       
   331         $(LIBJAVA_HEADER_FLAGS)
       
   332         #
       
   333 
       
   334     LIBAWT_XAWT_CFLAGS += -DXAWT -DXAWT_HACK \
   533         -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \
   335         -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \
   534         $(CUPS_CFLAGS) \
   336         $(CUPS_CFLAGS)
   535         $(foreach dir, $(LIBAWT_XAWT_DIRS), -I$(dir)) \
       
   536         -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
       
   537         -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d \
       
   538         -I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \
       
   539         -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \
       
   540         -I$(JDK_TOPDIR)/src/share/native/sun/awt/image \
       
   541         -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
       
   542         -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
       
   543         -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/jdga
       
   544 
   337 
   545     ifeq ($(OPENJDK_TARGET_OS), solaris)
   338     ifeq ($(OPENJDK_TARGET_OS), solaris)
   546       LIBAWT_XAWT_CFLAGS += -DFUNCPROTO=15
   339       LIBAWT_XAWT_CFLAGS += -DFUNCPROTO=15
   547     endif
   340     endif
   548 
   341 
   554 
   347 
   555     ifeq ($(MILESTONE), internal)
   348     ifeq ($(MILESTONE), internal)
   556       LIBAWT_XAWT_CFLAGS += -DINTERNAL_BUILD
   349       LIBAWT_XAWT_CFLAGS += -DINTERNAL_BUILD
   557     endif
   350     endif
   558 
   351 
   559     LIBAWT_XAWT_FILES := \
       
   560         XlibWrapper.c \
       
   561         XWindow.c \
       
   562         XToolkit.c \
       
   563         X11Color.c \
       
   564         X11SurfaceData.c \
       
   565         awt_GraphicsEnv.c \
       
   566         awt_InputMethod.c \
       
   567         robot_common.c \
       
   568         awt_Robot.c \
       
   569         list.c \
       
   570         multiVis.c \
       
   571         initIDs.c \
       
   572         awt_util.c \
       
   573         awt_Desktop.c \
       
   574         awt_UNIXToolkit.c \
       
   575         X11FontScaler_md.c \
       
   576         X11TextRenderer_md.c \
       
   577         fontpath.c \
       
   578         awt_Insets.c \
       
   579         awt_Event.c \
       
   580         X11Renderer.c \
       
   581         X11PMBlitLoops.c \
       
   582         OGLBlitLoops.c \
       
   583         OGLBufImgOps.c \
       
   584         OGLContext.c \
       
   585         OGLFuncs.c \
       
   586         OGLMaskBlit.c \
       
   587         OGLMaskFill.c \
       
   588         OGLPaints.c \
       
   589         OGLRenderQueue.c \
       
   590         OGLRenderer.c \
       
   591         OGLSurfaceData.c \
       
   592         OGLTextRenderer.c \
       
   593         OGLVertexCache.c \
       
   594         GLXGraphicsConfig.c \
       
   595         GLXSurfaceData.c \
       
   596         AccelGlyphCache.c \
       
   597         awt_Font.c \
       
   598         multi_font.c \
       
   599         awt_AWTEvent.c \
       
   600         awt_DrawingSurface.c \
       
   601         jawt.c \
       
   602         CUPSfuncs.c \
       
   603         debug_assert.c \
       
   604         debug_mem.c \
       
   605         debug_trace.c \
       
   606         debug_util.c \
       
   607         gnome_interface.c \
       
   608         gtk2_interface.c \
       
   609         swing_GTKEngine.c \
       
   610         swing_GTKStyle.c \
       
   611         rect.c \
       
   612         sun_awt_X11_GtkFileDialogPeer.c \
       
   613         XRSurfaceData.c \
       
   614         XRBackendNative.c
       
   615 
       
   616     LIBAWT_XAWT_LDFLAGS_SUFFIX := $(LIBM) -lawt -lXext -lX11 -lXrender $(LIBDL) -lXtst -lXi -ljava -ljvm -lc
   352     LIBAWT_XAWT_LDFLAGS_SUFFIX := $(LIBM) -lawt -lXext -lX11 -lXrender $(LIBDL) -lXtst -lXi -ljava -ljvm -lc
   617 
   353 
   618     ifeq ($(OPENJDK_TARGET_OS), linux)
   354     ifeq ($(OPENJDK_TARGET_OS), linux)
   619       # To match old build, add this to LDFLAGS instead of suffix.
   355       # To match old build, add this to LDFLAGS instead of suffix.
   620       LIBAWT_XAWT_LDFLAGS += -lpthread
   356       LIBAWT_XAWT_LDFLAGS += -lpthread
   622 
   358 
   623     $(eval $(call SetupNativeCompilation,BUILD_LIBAWT_XAWT, \
   359     $(eval $(call SetupNativeCompilation,BUILD_LIBAWT_XAWT, \
   624         LIBRARY := awt_xawt, \
   360         LIBRARY := awt_xawt, \
   625         OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
   361         OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
   626         SRC := $(LIBAWT_XAWT_DIRS), \
   362         SRC := $(LIBAWT_XAWT_DIRS), \
   627         INCLUDE_FILES := $(LIBAWT_XAWT_FILES), \
   363         EXCLUDES := $(LIBAWT_XAWT_EXCLUDES), \
   628         LANG := C, \
   364         LANG := C, \
   629         OPTIMIZATION := LOW, \
   365         OPTIMIZATION := LOW, \
   630         CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_XAWT_CFLAGS) \
   366         CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_XAWT_CFLAGS) \
   631             $(X_CFLAGS), \
   367             $(X_CFLAGS), \
   632         MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libawt_xawt/mapfile-vers, \
   368         MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libawt_xawt/mapfile-vers, \
   633         LDFLAGS := $(LDFLAGS_JDKLIB) \
   369         LDFLAGS := $(LDFLAGS_JDKLIB) \
   634             $(X_LIBS) $(LIBAWT_XAWT_LDFLAGS) \
   370             $(X_LIBS) $(LIBAWT_XAWT_LDFLAGS) \
   635             $(call SET_SHARED_LIBRARY_ORIGIN) \
   371             $(call SET_SHARED_LIBRARY_ORIGIN) \
   636             $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
   372             $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
   637         LDFLAGS_SUFFIX := $(LIBAWT_XAWT_LDFLAGS_SUFFIX), \
   373         LDFLAGS_SUFFIX := $(LIBAWT_XAWT_LDFLAGS_SUFFIX), \
   638         VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
   374         VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
   639         RC_FLAGS := $(RC_FLAGS) \
   375         RC_FLAGS := $(RC_FLAGS) \
   640             -D "JDK_FNAME=xawt.dll" \
   376             -D "JDK_FNAME=xawt.dll" \
   641             -D "JDK_INTERNAL_NAME=xawt" \
   377             -D "JDK_INTERNAL_NAME=xawt" \
   642             -D "JDK_FTYPE=0x2L", \
   378             -D "JDK_FTYPE=0x2L", \
   643         OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libawt_xawt, \
   379         OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libawt_xawt, \
   645 
   381 
   646     $(BUILD_LIBAWT_XAWT): $(BUILD_LIBJAVA)
   382     $(BUILD_LIBAWT_XAWT): $(BUILD_LIBJAVA)
   647 
   383 
   648     $(BUILD_LIBAWT_XAWT): $(BUILD_LIBAWT)
   384     $(BUILD_LIBAWT_XAWT): $(BUILD_LIBAWT)
   649 
   385 
   650     BUILD_LIBRARIES += $(BUILD_LIBAWT_XAWT)
   386     DESKTOP_LIBRARIES += $(BUILD_LIBAWT_XAWT)
   651 
   387 
   652   endif
   388   endif
   653 endif
   389 endif
   654 
   390 
   655 ##########################################################################################
   391 ##########################################################################################
   656 
   392 
   657 LIBLCMS_DIR := $(JDK_TOPDIR)/src/share/native/sun/java2d/cmm/lcms
   393 LIBLCMS_SRC := $(JDK_TOPDIR)/src/java.desktop/share/native/liblcms
       
   394 LIBLCMS_CPPFLAGS += -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \
       
   395     -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d \
       
   396     -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/debug \
       
   397     $(LIBJAVA_HEADER_FLAGS) \
       
   398     #
   658 
   399 
   659 ifeq ($(USE_EXTERNAL_LCMS), true)
   400 ifeq ($(USE_EXTERNAL_LCMS), true)
   660   # If we're using an external library, we'll just need the wrapper part.
   401   # If we're using an external library, we'll just need the wrapper part.
   661   # By including it explicitely, all other files will be excluded.
   402   # By including it explicitely, all other files will be excluded.
   662   BUILD_LIBLCMS_INCLUDE_FILES := LCMS.c
   403   BUILD_LIBLCMS_INCLUDE_FILES := LCMS.c
   663   BUILD_LIBLCMS_HEADERS :=
       
   664 else
   404 else
   665   BUILD_LIBLCMS_INCLUDE_FILES :=
   405   BUILD_LIBLCMS_INCLUDE_FILES :=
   666   # If we're using the bundled library, we'll need to include it in the
   406   # If we're using the bundled library, we'll need to include it in the
   667   # include path explicitly. Otherwise the system headers will be used.
   407   # include path explicitly. Otherwise the system headers will be used.
   668   BUILD_LIBLCMS_HEADERS := -I$(LIBLCMS_DIR)
   408   LIBLCMS_CPPFLAGS += $(addprefix -I, $(LIBLCMS_SRC))
   669 endif
   409 endif
   670 
   410 
   671 # TODO: Update awt lib path when awt is converted
       
   672 $(eval $(call SetupNativeCompilation,BUILD_LIBLCMS, \
   411 $(eval $(call SetupNativeCompilation,BUILD_LIBLCMS, \
   673     LIBRARY := lcms, \
   412     LIBRARY := lcms, \
   674     OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
   413     OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
   675     SRC := $(LIBLCMS_DIR), \
   414     SRC := $(LIBLCMS_SRC), \
   676     INCLUDE_FILES := $(BUILD_LIBLCMS_INCLUDE_FILES), \
   415     INCLUDE_FILES := $(BUILD_LIBLCMS_INCLUDE_FILES), \
   677     LANG := C, \
   416     LANG := C, \
   678     OPTIMIZATION := HIGHEST, \
   417     OPTIMIZATION := HIGHEST, \
   679     CFLAGS := $(filter-out -xc99=%none, $(CFLAGS_JDKLIB)) \
   418     CFLAGS := $(filter-out -xc99=%none, $(CFLAGS_JDKLIB)) \
   680         $(SHARED_LIBRARY_FLAGS) \
   419         $(SHARED_LIBRARY_FLAGS) $(LIBLCMS_CPPFLAGS) \
   681         -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
       
   682         -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
       
   683         $(BUILD_LIBLCMS_HEADERS) \
       
   684         $(LCMS_CFLAGS), \
   420         $(LCMS_CFLAGS), \
   685     CFLAGS_solaris := -xc99=no_lib, \
   421     CFLAGS_solaris := -xc99=no_lib, \
   686     CFLAGS_windows := -DCMS_IS_WINDOWS_, \
   422     CFLAGS_windows := -DCMS_IS_WINDOWS_, \
   687     MAPFILE := $(JDK_TOPDIR)/make/mapfiles/liblcms/mapfile-vers, \
   423     MAPFILE := $(JDK_TOPDIR)/make/mapfiles/liblcms/mapfile-vers, \
   688     LDFLAGS := $(LDFLAGS_JDKLIB) \
   424     LDFLAGS := $(LDFLAGS_JDKLIB) \
   691     LDFLAGS_windows := $(WIN_AWT_LIB) $(WIN_JAVA_LIB), \
   427     LDFLAGS_windows := $(WIN_AWT_LIB) $(WIN_JAVA_LIB), \
   692     LDFLAGS_SUFFIX_solaris := -lawt -ljava -ljvm -lc $(LCMS_LIBS), \
   428     LDFLAGS_SUFFIX_solaris := -lawt -ljava -ljvm -lc $(LCMS_LIBS), \
   693     LDFLAGS_SUFFIX_macosx := $(LIBM) -lawt -ljava -ljvm $(LCMS_LIBS), \
   429     LDFLAGS_SUFFIX_macosx := $(LIBM) -lawt -ljava -ljvm $(LCMS_LIBS), \
   694     LDFLAGS_SUFFIX_linux := -lm -lawt -ljava -ljvm $(LCMS_LIBS), \
   430     LDFLAGS_SUFFIX_linux := -lm -lawt -ljava -ljvm $(LCMS_LIBS), \
   695     LDFLAGS_SUFFIX_aix := -lm -lawt -ljava -ljvm $(LCMS_LIBS),\
   431     LDFLAGS_SUFFIX_aix := -lm -lawt -ljava -ljvm $(LCMS_LIBS),\
   696     VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
   432     VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
   697     RC_FLAGS := $(RC_FLAGS) \
   433     RC_FLAGS := $(RC_FLAGS) \
   698         -D "JDK_FNAME=lcms.dll" \
   434         -D "JDK_FNAME=lcms.dll" \
   699         -D "JDK_INTERNAL_NAME=lcms" \
   435         -D "JDK_INTERNAL_NAME=lcms" \
   700         -D "JDK_FTYPE=0x2L", \
   436         -D "JDK_FTYPE=0x2L", \
   701     OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/liblcms, \
   437     OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/liblcms, \
   702     DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
   438     DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
   703 
   439 
   704 BUILD_LIBRARIES += $(BUILD_LIBLCMS)
   440 DESKTOP_LIBRARIES += $(BUILD_LIBLCMS)
   705 
   441 
   706 $(BUILD_LIBLCMS): $(BUILD_LIBAWT)
   442 $(BUILD_LIBLCMS): $(BUILD_LIBAWT)
   707 
   443 
   708 ##########################################################################################
   444 ##########################################################################################
   709 
       
   710 BUILD_LIBJAVAJPEG_DIR := $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg
       
   711 
   445 
   712 ifdef OPENJDK
   446 ifdef OPENJDK
   713   BUILD_LIBJAVAJPEG_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjpeg/mapfile-vers
   447   BUILD_LIBJAVAJPEG_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjpeg/mapfile-vers
   714 else
   448 else
   715   BUILD_LIBJAVAJPEG_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjpeg/mapfile-vers-closed
   449   BUILD_LIBJAVAJPEG_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjpeg/mapfile-vers-closed
   716   BUILD_LIBJAVAJPEG_CLOSED_SRC := $(JDK_TOPDIR)/src/closed/share/native/sun/awt/image/jpeg
   450   LIBJAVAJPEG_SRC += $(JDK_TOPDIR)/src/closed/java.desktop/share/native/libjavajpeg
   717   BUILD_LIBJAVAJPEG_CLOSED_INCLUDES := -I$(BUILD_LIBJAVAJPEG_CLOSED_SRC)
   451 endif
   718 endif
   452 
       
   453 LIBJAVAJPEG_SRC += $(JDK_TOPDIR)/src/java.desktop/share/native/libjavajpeg
   719 
   454 
   720 BUILD_LIBJAVAJPEG_REORDER :=
   455 BUILD_LIBJAVAJPEG_REORDER :=
   721 ifeq ($(OPENJDK_TARGET_OS), solaris)
   456 ifeq ($(OPENJDK_TARGET_OS), solaris)
   722   ifneq ($(OPENJDK_TARGET_CPU), x86_64)
   457   ifneq ($(OPENJDK_TARGET_CPU), x86_64)
   723     BUILD_LIBJAVAJPEG_REORDER := $(JDK_TOPDIR)/make/mapfiles/libjpeg/reorder-$(OPENJDK_TARGET_CPU)
   458     BUILD_LIBJAVAJPEG_REORDER := $(JDK_TOPDIR)/make/mapfiles/libjpeg/reorder-$(OPENJDK_TARGET_CPU)
   747       jpegdecoder.c
   482       jpegdecoder.c
   748   BUILD_LIBJAVAJPEG_HEADERS :=
   483   BUILD_LIBJAVAJPEG_HEADERS :=
   749 else
   484 else
   750   LIBJPEG_LIBS :=
   485   LIBJPEG_LIBS :=
   751   BUILD_LIBJAVAJPEG_INCLUDE_FILES :=
   486   BUILD_LIBJAVAJPEG_INCLUDE_FILES :=
   752   BUILD_LIBJAVAJPEG_HEADERS := -I$(BUILD_LIBJAVAJPEG_DIR)
   487   BUILD_LIBJAVAJPEG_HEADERS := $(addprefix -I, $(LIBJAVAJPEG_SRC))
   753 endif
   488 endif
   754 
   489 
   755 $(eval $(call SetupNativeCompilation,BUILD_LIBJAVAJPEG, \
   490 $(eval $(call SetupNativeCompilation,BUILD_LIBJAVAJPEG, \
   756     LIBRARY := javajpeg, \
   491     LIBRARY := javajpeg, \
   757     OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
   492     OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
   758     SRC := $(BUILD_LIBJAVAJPEG_CLOSED_SRC) \
   493     SRC := $(LIBJAVAJPEG_SRC), \
   759         $(BUILD_LIBJAVAJPEG_DIR), \
       
   760     INCLUDE_FILES := $(BUILD_LIBJAVAJPEG_INCLUDE_FILES), \
   494     INCLUDE_FILES := $(BUILD_LIBJAVAJPEG_INCLUDE_FILES), \
   761     LANG := C, \
   495     LANG := C, \
   762     OPTIMIZATION := HIGHEST, \
   496     OPTIMIZATION := HIGHEST, \
   763     CFLAGS := $(CFLAGS_JDKLIB) \
   497     CFLAGS := $(CFLAGS_JDKLIB) $(addprefix -I, $(LIBJAVAJPEG_SRC)) \
   764         $(BUILD_LIBJAVAJPEG_CLOSED_INCLUDES) \
   498         $(LIBJAVA_HEADER_FLAGS) \
   765         $(BUILD_LIBJAVAJPEG_HEADERS), \
   499         -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop, \
   766     MAPFILE := $(BUILD_LIBJAVAJPEG_MAPFILE), \
   500     MAPFILE := $(BUILD_LIBJAVAJPEG_MAPFILE), \
   767     LDFLAGS := $(LDFLAGS_JDKLIB) $(LIBJPEG_LIBS) \
   501     LDFLAGS := $(LDFLAGS_JDKLIB) $(LIBJPEG_LIBS) \
   768         $(call SET_SHARED_LIBRARY_ORIGIN), \
   502         $(call SET_SHARED_LIBRARY_ORIGIN), \
   769     LDFLAGS_windows := $(WIN_JAVA_LIB) jvm.lib, \
   503     LDFLAGS_windows := $(WIN_JAVA_LIB) jvm.lib, \
   770     LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \
   504     LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \
   771     VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
   505     VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
   772     RC_FLAGS := $(RC_FLAGS) \
   506     RC_FLAGS := $(RC_FLAGS) \
   773         -D "JDK_FNAME=javajpeg.dll" \
   507         -D "JDK_FNAME=javajpeg.dll" \
   774         -D "JDK_INTERNAL_NAME=javajpeg" \
   508         -D "JDK_INTERNAL_NAME=javajpeg" \
   775         -D "JDK_FTYPE=0x2L", \
   509         -D "JDK_FTYPE=0x2L", \
   776     REORDER := $(BUILD_LIBJAVAJPEG_REORDER), \
   510     REORDER := $(BUILD_LIBJAVAJPEG_REORDER), \
   777     OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjpeg, \
   511     OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjavajpeg, \
   778     DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
   512     DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
   779 
   513 
   780 $(BUILD_LIBJAVAJPEG): $(BUILD_LIBJAVA)
   514 $(BUILD_LIBJAVAJPEG): $(BUILD_LIBJAVA)
   781 
   515 
   782 BUILD_LIBRARIES += $(BUILD_LIBJAVAJPEG)
   516 DESKTOP_LIBRARIES += $(BUILD_LIBJAVAJPEG)
   783 
   517 
   784 ##########################################################################################
   518 ##########################################################################################
       
   519 
       
   520 LIBFONTMANAGER_SRC := $(JDK_TOPDIR)/src/java.desktop/share/native/libfontmanager \
       
   521     $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libfontmanager
       
   522 LIBFONTMANAGER_CFLAGS := \
       
   523     $(addprefix -I, $(shell $(FIND) \
       
   524       $(LIBFONTMANAGER_SRC) \
       
   525       $(JDK_TOPDIR)/src/java.desktop/share/native/libawt \
       
   526       $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt \
       
   527       $(JDK_TOPDIR)/src/java.desktop/share/native/common \
       
   528       $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common -type d)) \
       
   529     -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \
       
   530     $(LIBJAVA_HEADER_FLAGS) \
       
   531     #
   785 
   532 
   786 ifndef OPENJDK
   533 ifndef OPENJDK
   787   FONT_HEADERS := -I$(JDK_TOPDIR)/src/closed/share/native/sun/font/t2k
   534   LIBFONTMANAGER_CFLAGS += -I$(JDK_TOPDIR)/src/closed/java.desktop/share/native/libt2k
   788   BUILD_LIBFONTMANAGER_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libfontmanager/mapfile-vers
   535   BUILD_LIBFONTMANAGER_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libfontmanager/mapfile-vers
   789   LIBFONTMANAGER_EXCLUDE_FILES += freetypeScaler.c
   536   LIBFONTMANAGER_EXCLUDE_FILES += freetypeScaler.c
   790 else
   537 else
   791   FONT_HEADERS := $(FREETYPE_CFLAGS)
   538   LIBFONTMANAGER_CFLAGS += $(FREETYPE_CFLAGS)
   792   BUILD_LIBFONTMANAGER_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libfontmanager/mapfile-vers.openjdk
   539   BUILD_LIBFONTMANAGER_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libfontmanager/mapfile-vers.openjdk
   793   BUILD_LIBFONTMANAGER_FONTLIB := $(FREETYPE_LIBS)
   540   BUILD_LIBFONTMANAGER_FONTLIB := $(FREETYPE_LIBS)
   794 endif
   541 endif
   795 
   542 
   796 LIBFONTMANAGER_OPTIMIZATION := HIGH
   543 LIBFONTMANAGER_OPTIMIZATION := HIGH
   797 
   544 
   798 ifeq ($(OPENJDK_TARGET_OS), windows)
   545 ifeq ($(OPENJDK_TARGET_OS), windows)
   799   LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \
   546   LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \
   800       X11TextRenderer.c
   547       X11TextRenderer.c
   801   LIBFONTMANAGER_OPTIMIZATION := HIGHEST
   548   LIBFONTMANAGER_OPTIMIZATION := HIGHEST
       
   549   LIBFONTMANAGER_CFLAGS += -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt/sun/windows
   802 else ifeq ($(OPENJDK_TARGET_OS), macosx)
   550 else ifeq ($(OPENJDK_TARGET_OS), macosx)
   803   LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \
   551   LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \
   804       X11TextRenderer.c \
   552       X11TextRenderer.c \
   805       fontpath.c \
   553       fontpath.c \
   806       lcdglyph.c
   554       lcdglyph.c
   807 else
   555 else
   808   LIBFONTMANAGER_EXCLUDE_FILES += fontpath.c \
   556   LIBFONTMANAGER_EXCLUDE_FILES += fontpath.c \
   809       lcdglyph.c
   557       lcdglyph.c
   810 endif
   558 endif
   811 
   559 
   812 BUILD_LIBFONTMANAGER_CFLAGS_COMMON := \
   560 LIBFONTMANAGER_CFLAGS += $(FONT_HEADERS) $(X_CFLAGS) -DLE_STANDALONE -DHEADLESS
   813     $(FONT_HEADERS) \
       
   814     $(X_CFLAGS) \
       
   815     -DLE_STANDALONE -DHEADLESS \
       
   816     -I$(JDK_TOPDIR)/src/share/native/sun/font \
       
   817     -I$(JDK_TOPDIR)/src/share/native/sun/font/layout \
       
   818     -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
       
   819     -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt \
       
   820     -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
       
   821     -I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \
       
   822     -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \
       
   823     -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d \
       
   824     -I$(JDK_TOPDIR)/src/share/native/sun/java2d
       
   825 
   561 
   826 # Turn off aliasing with GCC for ExtensionSubtables.cpp
   562 # Turn off aliasing with GCC for ExtensionSubtables.cpp
   827 ifeq ($(OPENJDK_TARGET_OS), linux)
   563 ifeq ($(OPENJDK_TARGET_OS), linux)
   828   BUILD_LIBFONTMANAGER_ExtensionSubtables.cpp_CXXFLAGS := -fno-strict-aliasing
   564   BUILD_LIBFONTMANAGER_ExtensionSubtables.cpp_CXXFLAGS := -fno-strict-aliasing
   829 endif
   565 endif
   833 # to libawt_xawt will fail without the -L parameters from X_LIBS. Filter
   569 # to libawt_xawt will fail without the -L parameters from X_LIBS. Filter
   834 # out the -R parameters since they aren't needed.
   570 # out the -R parameters since they aren't needed.
   835 $(eval $(call SetupNativeCompilation,BUILD_LIBFONTMANAGER, \
   571 $(eval $(call SetupNativeCompilation,BUILD_LIBFONTMANAGER, \
   836     LIBRARY := fontmanager, \
   572     LIBRARY := fontmanager, \
   837     OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
   573     OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
   838     SRC := $(JDK_TOPDIR)/src/share/native/sun/font \
   574     SRC := $(LIBFONTMANAGER_SRC), \
   839         $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/font, \
       
   840     EXCLUDE_FILES := $(LIBFONTMANAGER_EXCLUDE_FILES) \
   575     EXCLUDE_FILES := $(LIBFONTMANAGER_EXCLUDE_FILES) \
   841         AccelGlyphCache.c, \
   576         AccelGlyphCache.c, \
   842     LANG := C++, \
   577     LANG := C++, \
   843     CFLAGS := $(CFLAGS_JDKLIB) $(BUILD_LIBFONTMANAGER_CFLAGS_COMMON), \
   578     CFLAGS := $(CFLAGS_JDKLIB) $(LIBFONTMANAGER_CFLAGS), \
   844     CXXFLAGS := $(CXXFLAGS_JDKLIB) $(BUILD_LIBFONTMANAGER_CFLAGS_COMMON), \
   579     CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBFONTMANAGER_CFLAGS), \
   845     OPTIMIZATION := $(LIBFONTMANAGER_OPTIMIZATION), \
   580     OPTIMIZATION := $(LIBFONTMANAGER_OPTIMIZATION), \
   846     CFLAGS_windows = -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/windows \
   581     CFLAGS_windows = -DCC_NOEX, \
   847         -DCC_NOEX, \
       
   848     MAPFILE := $(BUILD_LIBFONTMANAGER_MAPFILE), \
   582     MAPFILE := $(BUILD_LIBFONTMANAGER_MAPFILE), \
   849     LDFLAGS := $(subst -Xlinker -z -Xlinker defs,,$(LDFLAGS_JDKLIB)) $(LDFLAGS_CXX_JDK) \
   583     LDFLAGS := $(subst -Xlinker -z -Xlinker defs,,$(LDFLAGS_JDKLIB)) $(LDFLAGS_CXX_JDK) \
   850         $(call SET_SHARED_LIBRARY_ORIGIN), \
   584         $(call SET_SHARED_LIBRARY_ORIGIN), \
   851     LDFLAGS_SUFFIX := $(BUILD_LIBFONTMANAGER_FONTLIB), \
   585     LDFLAGS_SUFFIX := $(BUILD_LIBFONTMANAGER_FONTLIB), \
   852     LDFLAGS_SUFFIX_linux := -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \
   586     LDFLAGS_SUFFIX_linux := -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \
   855     LDFLAGS_SUFFIX_aix := -lawt -lawt_xawt $(LIBM) $(LIBCXX) -ljava -ljvm,\
   589     LDFLAGS_SUFFIX_aix := -lawt -lawt_xawt $(LIBM) $(LIBCXX) -ljava -ljvm,\
   856     LDFLAGS_SUFFIX_macosx := -lawt $(LIBM) $(LIBCXX) -undefined dynamic_lookup \
   590     LDFLAGS_SUFFIX_macosx := -lawt $(LIBM) $(LIBCXX) -undefined dynamic_lookup \
   857         -ljava -ljvm, \
   591         -ljava -ljvm, \
   858     LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \
   592     LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \
   859         $(WIN_AWT_LIB), \
   593         $(WIN_AWT_LIB), \
   860     VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
   594     VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
   861     RC_FLAGS := $(RC_FLAGS) \
   595     RC_FLAGS := $(RC_FLAGS) \
   862         -D "JDK_FNAME=fontmanager.dll" \
   596         -D "JDK_FNAME=fontmanager.dll" \
   863         -D "JDK_INTERNAL_NAME=fontmanager" \
   597         -D "JDK_INTERNAL_NAME=fontmanager" \
   864         -D "JDK_FTYPE=0x2L", \
   598         -D "JDK_FTYPE=0x2L", \
   865     OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libfontmanager, \
   599     OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libfontmanager, \
   869 
   603 
   870 ifneq (, $(findstring $(OPENJDK_TARGET_OS), solaris aix))
   604 ifneq (, $(findstring $(OPENJDK_TARGET_OS), solaris aix))
   871   $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT_XAWT)
   605   $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT_XAWT)
   872 endif
   606 endif
   873 
   607 
   874 BUILD_LIBRARIES += $(BUILD_LIBFONTMANAGER)
   608 DESKTOP_LIBRARIES += $(BUILD_LIBFONTMANAGER)
   875 
   609 
   876 ##########################################################################################
   610 ##########################################################################################
   877 
   611 
   878 ifndef OPENJDK
   612 ifndef OPENJDK
   879 
   613 
   880   #ifeq ($(OPENJDK_TARGET_OS), linux)
   614   LIBT2K_SRC := $(JDK_TOPDIR)/src/closed/java.desktop/share/native/libt2k
   881   #  ifeq ("$(CC_VER_MAJOR)", "3")
   615   LIBT2K_CFLAGS := $(addprefix -I, $(LIBT2K_SRC)) \
   882   #    OTHER_LDLIBS += -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic
   616       -I$(JDK_TOPDIR)/src/closed/java.desktop/share/native/libt2k/t2k \
   883   #  endif
   617       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libfontmanager \
   884   #endif
   618       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d \
       
   619       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d/loops \
       
   620       -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/font \
       
   621       -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \
       
   622       -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/libjava \
       
   623       -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \
   885   #
   624   #
   886   # The resulting size of the t2k lib file is (at least on linux) dependant on the order of
       
   887   # the input .o files. Because of this the new build will differ in size to the old build.
       
   888   BUILD_LIBT2K_CFLAGS_COMMON := -I$(JDK_TOPDIR)/src/share/native/sun/font \
       
   889       -I$(JDK_TOPDIR)/src/closed/share/native/sun/font/t2k \
       
   890       -I$(JDK_TOPDIR)/src/closed/share/native/sun/font \
       
   891       -I$(JDK_TOPDIR)/src/share/share/native/sun/font \
       
   892       -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/font \
       
   893       -I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \
       
   894       -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \
       
   895       -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d \
       
   896       -I$(JDK_TOPDIR)/src/share/native/sun/java2d
       
   897 
   625 
   898   $(eval $(call SetupNativeCompilation,BUILD_LIBT2K, \
   626   $(eval $(call SetupNativeCompilation,BUILD_LIBT2K, \
   899       LIBRARY := t2k, \
   627       LIBRARY := t2k, \
   900       OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
   628       OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
   901       SRC := $(JDK_TOPDIR)/src/closed/share/native/sun/font \
   629       SRC := $(LIBT2K_SRC), \
   902           $(JDK_TOPDIR)/src/closed/share/native/sun/font/t2k \
   630       EXCLUDE_FILES := t2k/orion.c, \
   903           $(JDK_TOPDIR)/src/closed/share/native/sun/font/t2k/ttHints, \
       
   904       EXCLUDE_FILES := orion.c, \
       
   905       LANG := C++, \
   631       LANG := C++, \
   906       OPTIMIZATION := HIGH, \
   632       OPTIMIZATION := HIGH, \
   907       CFLAGS := $(CFLAGS_JDKLIB) $(BUILD_LIBT2K_CFLAGS_COMMON), \
   633       CFLAGS := $(CFLAGS_JDKLIB) $(LIBT2K_CFLAGS), \
   908       CXXFLAGS := $(CXXFLAGS_JDKLIB) $(BUILD_LIBT2K_CFLAGS_COMMON), \
   634       CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBT2K_CFLAGS), \
   909       CFLAGS_windows = -DCC_NOEX, \
   635       CFLAGS_windows = -DCC_NOEX, \
   910       CXXFLAGS_windows = -DCC_NOEX, \
   636       CXXFLAGS_windows = -DCC_NOEX, \
   911       MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libt2k/mapfile-vers, \
   637       MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libt2k/mapfile-vers, \
   912       LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
   638       LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
   913           $(call SET_SHARED_LIBRARY_ORIGIN), \
   639           $(call SET_SHARED_LIBRARY_ORIGIN), \
   914       LDFLAGS_windows := user32.lib $(JDK_OUTPUTDIR)/objs/libfontmanager/fontmanager.lib, \
   640       LDFLAGS_windows := user32.lib $(JDK_OUTPUTDIR)/objs/libfontmanager/fontmanager.lib, \
   915       LDFLAGS_SUFFIX_posix := $(LIBM) $(LIBCXX) -lfontmanager -ljava -ljvm -lc, \
   641       LDFLAGS_SUFFIX_posix := $(LIBM) $(LIBCXX) -lfontmanager -ljava -ljvm -lc, \
   916       LDFLAGS_SUFFIX_solaris := -lawt -lawt_xawt, \
   642       LDFLAGS_SUFFIX_solaris := -lawt -lawt_xawt, \
   917       VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
   643       VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
   918       RC_FLAGS := $(RC_FLAGS) \
   644       RC_FLAGS := $(RC_FLAGS) \
   919           -D "JDK_FNAME=t2k.dll" \
   645           -D "JDK_FNAME=t2k.dll" \
   920           -D "JDK_INTERNAL_NAME=t2k" \
   646           -D "JDK_INTERNAL_NAME=t2k" \
   921           -D "JDK_FTYPE=0x2L", \
   647           -D "JDK_FTYPE=0x2L", \
   922       OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libt2k, \
   648       OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libt2k, \
   923       DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
   649       DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
   924 
   650 
   925   # t2k is linked against fontmanager
   651   # t2k is linked against fontmanager
   926   $(BUILD_LIBT2K): $(BUILD_LIBFONTMANAGER)
   652   $(BUILD_LIBT2K): $(BUILD_LIBFONTMANAGER)
   927 
   653 
   928   BUILD_LIBRARIES += $(BUILD_LIBT2K)
   654   DESKTOP_LIBRARIES += $(BUILD_LIBT2K)
   929 endif
   655 endif
   930 
   656 
   931 ##########################################################################################
   657 ##########################################################################################
   932 
   658 
   933 ifeq ($(OPENJDK_TARGET_OS), windows)
   659 ifeq ($(OPENJDK_TARGET_OS), windows)
       
   660   LIBJAWT_SRC := $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libjawt
       
   661   LIBJAWT_CFLAGS := -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt/sun/windows \
       
   662       -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/debug \
       
   663       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d \
       
   664       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/awt/image/cvutils \
       
   665       -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt/sun/java2d/windows \
       
   666       -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \
       
   667       -I$(JDK_TOPDIR)/src/java.desktop/windows/native/include \
       
   668       -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \
       
   669       $(LIBJAVA_HEADER_FLAGS) \
       
   670       #
       
   671 
   934   ifeq ($(OPENJDK_TARGET_CPU), x86)
   672   ifeq ($(OPENJDK_TARGET_CPU), x86)
   935     KERNEL32_LIB := kernel32.lib
   673     KERNEL32_LIB := kernel32.lib
   936   endif
   674   endif
   937   $(eval $(call SetupNativeCompilation,BUILD_LIBJAWT, \
   675   $(eval $(call SetupNativeCompilation,BUILD_LIBJAWT, \
   938       LIBRARY := jawt, \
   676       LIBRARY := jawt, \
   939       OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
   677       OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
   940       SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/windows, \
   678       SRC := $(LIBJAWT_SRC), \
   941       INCLUDE_FILES := jawt.cpp, \
   679       INCLUDE_FILES := $(LIBJAWT_INCLUDE_FILES), \
   942       LANG := C++, \
   680       LANG := C++, \
   943       OPTIMIZATION := LOW, \
   681       OPTIMIZATION := LOW, \
   944       CFLAGS := $(CXXFLAGS_JDKLIB) \
   682       CFLAGS := $(CXXFLAGS_JDKLIB) \
   945           -EHsc -DUNICODE -D_UNICODE \
   683           -EHsc -DUNICODE -D_UNICODE \
   946           -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/windows \
   684           $(LIBJAWT_CFLAGS), \
   947           -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
       
   948           -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
       
   949           -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
       
   950           -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/windows, \
       
   951       LDFLAGS := $(LDFLAGS_JDKLIB) $(KERNEL32_LIB) $(LDFLAGS_CXX_JDK) \
   685       LDFLAGS := $(LDFLAGS_JDKLIB) $(KERNEL32_LIB) $(LDFLAGS_CXX_JDK) \
   952           advapi32.lib $(WIN_AWT_LIB), \
   686           advapi32.lib $(WIN_AWT_LIB), \
   953       LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \
   687       LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \
   954       VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
   688       VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
   955       RC_FLAGS := $(RC_FLAGS) \
   689       RC_FLAGS := $(RC_FLAGS) \
   956           -D "JDK_FNAME=jawt.dll" \
   690           -D "JDK_FNAME=jawt.dll" \
   957           -D "JDK_INTERNAL_NAME=jawt" \
   691           -D "JDK_INTERNAL_NAME=jawt" \
   958           -D "JDK_FTYPE=0x2L", \
   692           -D "JDK_FTYPE=0x2L", \
   959       OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjawt, \
   693       OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjawt, \
   963 
   697 
   964   $(JDK_OUTPUTDIR)/lib/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX): $(BUILD_LIBJAWT)
   698   $(JDK_OUTPUTDIR)/lib/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX): $(BUILD_LIBJAWT)
   965 	$(ECHO) Copying $(@F)
   699 	$(ECHO) Copying $(@F)
   966 	$(CP) $(JDK_OUTPUTDIR)/objs/libjawt/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX) $@
   700 	$(CP) $(JDK_OUTPUTDIR)/objs/libjawt/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX) $@
   967 
   701 
   968   BUILD_LIBRARIES += $(JDK_OUTPUTDIR)/lib/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX)
   702   DESKTOP_LIBRARIES += $(JDK_OUTPUTDIR)/lib/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX)
   969 
   703 
   970 else # OPENJDK_TARGET_OS not windows
   704 else # OPENJDK_TARGET_OS not windows
   971 
   705 
   972   ifeq ($(OPENJDK_TARGET_OS), macosx)
   706   ifeq ($(OPENJDK_TARGET_OS), macosx)
   973     JAWT_FILES := jawt.m
   707     LIBJAWT_SRC := $(JDK_TOPDIR)/src/java.desktop/macosx/native/libjawt
       
   708   else
       
   709     LIBJAWT_SRC := $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libjawt
       
   710   endif
       
   711   LIBJAWT_CFLAGS := \
       
   712       -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/awt \
       
   713       -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/include \
       
   714       -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/include \
       
   715       -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \
       
   716       $(LIBJAVA_HEADER_FLAGS) \
       
   717       #
       
   718 
       
   719   ifeq ($(OPENJDK_TARGET_OS), macosx)
   974     JAWT_LIBS := -lawt_lwawt
   720     JAWT_LIBS := -lawt_lwawt
   975   else
   721   else
   976     JAWT_FILES := jawt.c
       
   977     JAWT_LIBS :=
   722     JAWT_LIBS :=
   978     ifneq ($(OPENJDK_TARGET_OS), solaris)
   723     ifneq ($(OPENJDK_TARGET_OS), solaris)
   979       JAWT_LIBS += -lawt
   724       JAWT_LIBS += -lawt
   980     endif
   725     endif
   981     ifndef BUILD_HEADLESS_ONLY
   726     ifndef BUILD_HEADLESS_ONLY
   987   endif
   732   endif
   988 
   733 
   989   $(eval $(call SetupNativeCompilation,BUILD_LIBJAWT, \
   734   $(eval $(call SetupNativeCompilation,BUILD_LIBJAWT, \
   990       LIBRARY := jawt, \
   735       LIBRARY := jawt, \
   991       OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
   736       OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
   992       SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt \
   737       SRC := $(LIBJAWT_SRC), \
   993           $(JDK_TOPDIR)/src/macosx/native/sun/awt, \
       
   994       INCLUDE_FILES := $(JAWT_FILES), \
   738       INCLUDE_FILES := $(JAWT_FILES), \
   995       LANG := C, \
   739       LANG := C, \
   996       OPTIMIZATION := LOW, \
   740       OPTIMIZATION := LOW, \
   997       CFLAGS := $(CFLAGS_JDKLIB), \
   741       CFLAGS := $(CFLAGS_JDKLIB) \
       
   742           $(LIBJAWT_CFLAGS), \
   998       CFLAGS_linux := $(HEADLESS_CFLAG), \
   743       CFLAGS_linux := $(HEADLESS_CFLAG), \
   999       CFLAGS_macosx := -I$(JDK_TOPDIR)/src/solaris/native/sun/awt, \
   744       CFLAGS_macosx := $(LIBJAWT_CFLAGS_macosx), \
  1000       MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjawt/mapfile-vers, \
   745       MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjawt/mapfile-vers, \
  1001       LDFLAGS := $(LDFLAGS_JDKLIB) \
   746       LDFLAGS := $(LDFLAGS_JDKLIB) \
  1002           $(call SET_SHARED_LIBRARY_ORIGIN), \
   747           $(call SET_SHARED_LIBRARY_ORIGIN), \
  1003       LDFLAGS_solaris := $(X_LIBS), \
   748       LDFLAGS_solaris := $(X_LIBS), \
  1004       LDFLAGS_SUFFIX_linux := $(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX), \
   749       LDFLAGS_SUFFIX_linux := $(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX), \
  1019     $(BUILD_LIBJAWT): $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt_lwawt$(SHARED_LIBRARY_SUFFIX)
   764     $(BUILD_LIBJAWT): $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt_lwawt$(SHARED_LIBRARY_SUFFIX)
  1020   endif
   765   endif
  1021 
   766 
  1022 endif # OPENJDK_TARGET_OS
   767 endif # OPENJDK_TARGET_OS
  1023 
   768 
  1024 BUILD_LIBRARIES += $(BUILD_LIBJAWT)
   769 DESKTOP_LIBRARIES += $(BUILD_LIBJAWT)
  1025 
   770 
  1026 ##########################################################################################
   771 ##########################################################################################
  1027 
   772 
  1028 ifndef OPENJDK
   773 ifndef OPENJDK
  1029 
   774 
  1030   BUILD_LIBKCMS_EXCLUDE_FILES :=
   775   LIBKCMS_SRC := $(JDK_TOPDIR)/src/closed/java.desktop/share/native/libkcms \
  1031   ifeq ($(OPENJDK_TARGET_OS), windows)
   776       $(JDK_TOPDIR)/src/closed/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libkcms \
  1032     BUILD_LIBKCMS_EXCLUDE_FILES += ukcpmgr.c unixmem.c
   777       #
  1033   else
   778   LIBKCMS_CFLAGS += $(addprefix -I, $(LIBKCMS_SRC)) \
  1034     BUILD_LIBKCMS_EXCLUDE_FILES += cmmdll.c registry.c spxffile.c sysinfo.c winmem.c wkcpmgr.c
   779       -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \
  1035   endif
   780       -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/libjava \
  1036 
   781       -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \
  1037   BUILD_LIBKCMS_FLAGS := $(CFLAGS_JDKLIB)
   782       #
       
   783   LIBKCMS_VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/closed/java.desktop/windows/native/libkcms/cmm.rc
       
   784 
       
   785   LIBKCMS_CFLAGS += $(CFLAGS_JDKLIB)
  1038 
   786 
  1039   ifeq ($(OPENJDK_TARGET_OS), solaris)
   787   ifeq ($(OPENJDK_TARGET_OS), solaris)
  1040     # This particular library uses a feature called PIC_CODE_SMALL (on solaris)
   788     # This particular library uses a feature called PIC_CODE_SMALL (on solaris)
  1041     # implement it like this...since it's only used here
   789     # implement it like this...since it's only used here
  1042     BUILD_LIBKCMS_FLAGS := $(patsubst -KPIC, -Kpic, $(BUILD_LIBKCMS_FLAGS))
   790     LIBKCMS_CFLAGS := $(patsubst -KPIC, -Kpic, $(LIBKCMS_CFLAGS))
  1043   else ifeq ($(OPENJDK_TARGET_CPU_ARCH), ppc)
   791   else ifeq ($(OPENJDK_TARGET_CPU_ARCH), ppc)
  1044     BUILD_LIBKCMS_FLAGS := $(patsubst -fPIC, -fpic, $(BUILD_LIBKCMS_FLAGS))
   792     LIBKCMS_CFLAGS := $(patsubst -fPIC, -fpic, $(LIBKCMS_CFLAGS))
  1045   endif
   793   endif
  1046 
   794 
  1047   $(eval $(call SetupNativeCompilation,BUILD_LIBKCMS, \
   795   $(eval $(call SetupNativeCompilation,BUILD_LIBKCMS, \
  1048       LIBRARY := kcms, \
   796       LIBRARY := kcms, \
  1049       OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
   797       OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
  1050       SRC := $(JDK_TOPDIR)/src/closed/share/native/sun/java2d/cmm/kcms, \
   798       SRC := $(LIBKCMS_SRC), \
  1051       LANG := C, \
   799       LANG := C, \
  1052       EXCLUDE_FILES := $(BUILD_LIBKCMS_EXCLUDE_FILES), \
   800       EXCLUDE_FILES := $(BUILD_LIBKCMS_EXCLUDE_FILES), \
  1053       OPTIMIZATION := LOW, \
   801       OPTIMIZATION := LOW, \
  1054       CFLAGS := $(BUILD_LIBKCMS_FLAGS) \
   802       CFLAGS := $(LIBKCMS_CFLAGS) \
  1055           -DJAVACMM -DFUT_CALC_EX -DNO_FUT_GCONST, \
   803           -DJAVACMM -DFUT_CALC_EX -DNO_FUT_GCONST, \
  1056       CFLAGS_linux := -Wno-missing-field-initializers, \
   804       CFLAGS_linux := -Wno-missing-field-initializers, \
  1057       MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libkcms/mapfile-vers, \
   805       MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libkcms/mapfile-vers, \
  1058       LDFLAGS := $(LDFLAGS_JDKLIB) \
   806       LDFLAGS := $(LDFLAGS_JDKLIB) \
  1059           $(call SET_SHARED_LIBRARY_ORIGIN), \
   807           $(call SET_SHARED_LIBRARY_ORIGIN), \
  1060       LDFLAGS_SUFFIX_linux := -lc -lpthread, \
   808       LDFLAGS_SUFFIX_linux := -lc -lpthread, \
  1061       LDFLAGS_SUFFIX_solaris := -lc, \
   809       LDFLAGS_SUFFIX_solaris := -lc, \
  1062       LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib version.lib, \
   810       LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib version.lib, \
  1063       LDFLAGS_SUFFIX_posix := -lm -ljava -ljvm, \
   811       LDFLAGS_SUFFIX_posix := -lm -ljava -ljvm, \
  1064       VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/closed/share/native/sun/java2d/cmm/kcms/cmm.rc, \
   812       VERSIONINFO_RESOURCE := $(LIBKCMS_VERSIONINFO_RESOURCE), \
  1065       VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/closed/share/native/sun/java2d/cmm/kcms/cmm.rc, \
       
  1066       RC_FLAGS := $(RC_FLAGS) \
   813       RC_FLAGS := $(RC_FLAGS) \
  1067           -D "JDK_FNAME=kcms.dll" \
   814           -D "JDK_FNAME=kcms.dll" \
  1068           -D "JDK_INTERNAL_NAME=kcms" \
   815           -D "JDK_INTERNAL_NAME=kcms" \
  1069           -D "JDK_FTYPE=0x2L", \
   816           -D "JDK_FTYPE=0x2L", \
  1070       OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libkcms, \
   817       OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libkcms, \
  1071       DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
   818       DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
  1072 
   819 
  1073   $(BUILD_LIBKCMS): $(BUILD_LIBJAVA)
   820   $(BUILD_LIBKCMS): $(BUILD_LIBJAVA)
  1074 
   821 
  1075   BUILD_LIBRARIES += $(BUILD_LIBKCMS)
   822   DESKTOP_LIBRARIES += $(BUILD_LIBKCMS)
  1076 
   823 
  1077 endif
   824 endif
  1078 
   825 
  1079 ##########################################################################################
   826 ##########################################################################################
  1080 
   827 
  1090         endif
   837         endif
  1091 
   838 
  1092         $(eval $(call SetupNativeCompilation,BUILD_LIBSUNWJDGA, \
   839         $(eval $(call SetupNativeCompilation,BUILD_LIBSUNWJDGA, \
  1093             LIBRARY := sunwjdga, \
   840             LIBRARY := sunwjdga, \
  1094             OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
   841             OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
  1095             SRC := $(JDK_TOPDIR)/src/solaris/native/sun/jdga, \
   842             SRC := $(JDK_TOPDIR)/src/java.desktop/unix/native/libsunwjdga, \
  1096             LANG := C, \
   843             LANG := C, \
  1097             OPTIMIZATION := LOW, \
   844             OPTIMIZATION := LOW, \
  1098             CFLAGS := $(CFLAGS_JDKLIB) \
   845             CFLAGS := $(CFLAGS_JDKLIB) \
  1099                 -I$(JDK_TOPDIR)/src/share/javavm/export \
   846                 -I$(JDK_TOPDIR)/src/share/javavm/export \
  1100                 -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/javavm/export \
   847                 -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/javavm/export \
  1104                 $(call SET_SHARED_LIBRARY_ORIGIN), \
   851                 $(call SET_SHARED_LIBRARY_ORIGIN), \
  1105             LDFLAGS_SUFFIX := $(X_LIBS) -ldga -lX11 $(LIBDL) -lc, \
   852             LDFLAGS_SUFFIX := $(X_LIBS) -ldga -lX11 $(LIBDL) -lc, \
  1106             OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libsunwjdga, \
   853             OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libsunwjdga, \
  1107             DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
   854             DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
  1108 
   855 
  1109         BUILD_LIBRARIES += $(BUILD_LIBSUNWJDGA)
   856         DESKTOP_LIBRARIES += $(BUILD_LIBSUNWJDGA)
  1110 
   857 
  1111       endif
   858       endif
  1112     endif
   859     endif
  1113   endif
   860   endif
  1114 endif
   861 endif
  1117 
   864 
  1118 ifeq ($(BUILD_HEADLESS), true)
   865 ifeq ($(BUILD_HEADLESS), true)
  1119   # Mac and Windows only use the native AWT lib, do not build libawt_headless
   866   # Mac and Windows only use the native AWT lib, do not build libawt_headless
  1120   ifeq ($(findstring $(OPENJDK_TARGET_OS), windows macosx),)
   867   ifeq ($(findstring $(OPENJDK_TARGET_OS), windows macosx),)
  1121 
   868 
  1122     LIBAWT_HEADLESS_DIRS := $(JDK_TOPDIR)/src/share/native/sun/font \
   869     LIBAWT_HEADLESS_DIRS := $(JDK_TOPDIR)/src/java.desktop/unix/native/libawt_headless/sun/awt \
  1123         $(JDK_TOPDIR)/src/share/native/sun/java2d/opengl \
   870         $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/awt \
  1124         $(JDK_TOPDIR)/src/solaris/native/sun/font \
   871         $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/java2d/opengl \
  1125         $(JDK_TOPDIR)/src/solaris/native/sun/awt \
   872         $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/java2d/x11 \
  1126         $(JDK_TOPDIR)/src/solaris/native/sun/java2d/opengl \
   873         $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/java2d/opengl \
  1127         $(JDK_TOPDIR)/src/solaris/native/sun/java2d/x11
   874         $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/font \
  1128 
   875         #
  1129     ifeq ($(OPENJDK_TARGET_OS), macosx)
   876 
  1130       LIBAWT_HEADLESS_DIRS += $(JDK_TOPDIR)/src/macosx/native/sun/font
   877     LIBAWT_HEADLESS_EXCLUDES := medialib
  1131     endif
   878     LIBAWT_HEADLESS_CFLAGS := -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \
  1132 
   879         $(addprefix -I, $(LIBAWT_HEADLESS_DIRS)) \
  1133     LIBAWT_HEADLESS_CFLAGS := -DHEADLESS=true \
   880         -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d \
  1134         -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \
   881         -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d/loops \
  1135         $(CUPS_CFLAGS) \
   882         -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/awt/image/cvutils \
  1136         $(X_CFLAGS) \
   883         -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d/pipe \
  1137         -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
   884         -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/awt/image \
  1138         -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d \
   885         -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt/sun/java2d \
  1139         -I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \
   886         -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/font \
  1140         -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \
   887         -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/debug \
  1141         -I$(JDK_TOPDIR)/src/share/native/sun/awt/image \
   888         -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/font \
  1142         -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
   889         -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libsunwjdga/ \
  1143         -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
   890         $(LIBJAVA_HEADER_FLAGS) \
  1144         -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/jdga \
   891         #
  1145         $(foreach dir, $(LIBAWT_HEADLESS_DIRS), -I$(dir))
   892     LIBAWT_HEADLESS_EXFILES := initIDs.c
  1146 
       
  1147     LIBAWT_HEADLESS_FILES := \
       
  1148         awt_Font.c \
       
  1149         HeadlessToolkit.c \
       
  1150         fontpath.c \
       
  1151         VDrawingArea.c \
       
  1152         X11Color.c \
       
  1153         X11Renderer.c \
       
  1154         X11PMBlitLoops.c \
       
  1155         X11SurfaceData.c \
       
  1156         X11FontScaler_md.c \
       
  1157         X11TextRenderer_md.c \
       
  1158         OGLBlitLoops.c \
       
  1159         OGLBufImgOps.c \
       
  1160         OGLContext.c \
       
  1161         OGLFuncs.c \
       
  1162         OGLMaskBlit.c \
       
  1163         OGLMaskFill.c \
       
  1164         OGLPaints.c \
       
  1165         OGLRenderQueue.c \
       
  1166         OGLRenderer.c \
       
  1167         OGLSurfaceData.c \
       
  1168         OGLTextRenderer.c \
       
  1169         OGLVertexCache.c \
       
  1170         GLXGraphicsConfig.c \
       
  1171         GLXSurfaceData.c \
       
  1172         AccelGlyphCache.c \
       
  1173         CUPSfuncs.c
       
  1174 
   893 
  1175     LIBAWT_HEADLESS_REORDER :=
   894     LIBAWT_HEADLESS_REORDER :=
  1176     ifeq ($(OPENJDK_TARGET_OS), solaris)
   895     ifeq ($(OPENJDK_TARGET_OS), solaris)
  1177       ifneq ($(OPENJDK_TARGET_CPU), x86_64)
   896       ifneq ($(OPENJDK_TARGET_CPU), x86_64)
  1178         LIBAWT_HEADLESS_REORDER := $(JDK_TOPDIR)/make/mapfiles/libawt_headless/reorder-$(OPENJDK_TARGET_CPU)
   897         LIBAWT_HEADLESS_REORDER := $(JDK_TOPDIR)/make/mapfiles/libawt_headless/reorder-$(OPENJDK_TARGET_CPU)
  1181 
   900 
  1182     $(eval $(call SetupNativeCompilation,BUILD_LIBAWT_HEADLESS, \
   901     $(eval $(call SetupNativeCompilation,BUILD_LIBAWT_HEADLESS, \
  1183         LIBRARY := awt_headless, \
   902         LIBRARY := awt_headless, \
  1184         OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
   903         OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
  1185         SRC := $(LIBAWT_HEADLESS_DIRS), \
   904         SRC := $(LIBAWT_HEADLESS_DIRS), \
  1186         INCLUDE_FILES := $(LIBAWT_HEADLESS_FILES), \
   905         EXCLUDE_FILES := $(LIBAWT_HEADLESS_EXFILES), \
       
   906         EXCLUDES := $(LIBAWT_HEADLESS_EXCLUDES), \
  1187         LANG := C, \
   907         LANG := C, \
  1188         OPTIMIZATION := LOW, \
   908         OPTIMIZATION := LOW, \
  1189         CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_HEADLESS_CFLAGS), \
   909         CFLAGS := $(CFLAGS_JDKLIB) \
       
   910             -DHEADLESS=true \
       
   911             -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \
       
   912             $(CUPS_CFLAGS) \
       
   913             $(X_CFLAGS) \
       
   914             $(LIBAWT_HEADLESS_CFLAGS), \
  1190         MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libawt_headless/mapfile-vers, \
   915         MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libawt_headless/mapfile-vers, \
  1191         LDFLAGS := $(LDFLAGS_JDKLIB) \
   916         LDFLAGS := $(LDFLAGS_JDKLIB) \
  1192             $(call SET_SHARED_LIBRARY_ORIGIN), \
   917             $(call SET_SHARED_LIBRARY_ORIGIN), \
  1193         LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
   918         LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
  1194         LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
   919         LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
  1200         OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libawt_headless, \
   925         OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libawt_headless, \
  1201         DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
   926         DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
  1202 
   927 
  1203     $(BUILD_LIBAWT_HEADLESS): $(BUILD_LIBAWT)
   928     $(BUILD_LIBAWT_HEADLESS): $(BUILD_LIBAWT)
  1204 
   929 
  1205     BUILD_LIBRARIES += $(BUILD_LIBAWT_HEADLESS)
   930     DESKTOP_LIBRARIES += $(BUILD_LIBAWT_HEADLESS)
  1206 
   931 
  1207   endif
   932   endif
  1208 endif
   933 endif
  1209 
   934 
  1210 ##########################################################################################
   935 ##########################################################################################
  1211 
   936 
  1212 ifndef BUILD_HEADLESS_ONLY
   937 ifndef BUILD_HEADLESS_ONLY
       
   938 
  1213   LIBSPLASHSCREEN_DIRS := \
   939   LIBSPLASHSCREEN_DIRS := \
  1214     $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg \
   940       $(JDK_TOPDIR)/src/java.desktop/share/native/libjavajpeg \
  1215     $(JDK_TOPDIR)/src/share/native/sun/awt/splashscreen
   941       $(JDK_TOPDIR)/src/java.desktop/share/native/libsplashscreen \
       
   942       #
  1216 
   943 
  1217   ifeq ($(USE_EXTERNAL_LIBGIF), true)
   944   ifeq ($(USE_EXTERNAL_LIBGIF), true)
  1218     GIFLIB_LDFLAGS := -lgif
   945     GIFLIB_LDFLAGS := -lgif
       
   946     LIBSPLASHSCREEN_EXCLUDES := giflib
  1219   else
   947   else
  1220     LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/share/native/sun/awt/giflib
   948     LIBSPLASHSCREEN_CFLAGS += -I$(JDK_TOPDIR)/src/java.desktop/share/native/libsplashscreen/giflib
  1221     GIFLIB_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/giflib
       
  1222   endif
   949   endif
  1223 
   950 
  1224   ifeq ($(USE_EXTERNAL_LIBJPEG), true)
   951   ifeq ($(USE_EXTERNAL_LIBJPEG), true)
  1225     LIBJPEG_LDFLAGS := -ljpeg
   952     LIBJPEG_LDFLAGS := -ljpeg
  1226   else
   953   else
  1227     LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg
   954     LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/libjavajpeg
  1228     LIBJPEG_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg
   955     LIBJPEG_CFLAGS := -I$(JDK_TOPDIR)/src/java.desktop/share/native/libjavajpeg
  1229   endif
   956   endif
  1230 
   957 
  1231   ifeq ($(USE_EXTERNAL_LIBPNG), false)
   958   ifeq ($(USE_EXTERNAL_LIBPNG), false)
  1232     LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/share/native/sun/awt/libpng
   959     LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/libsplashscreen/libpng
  1233     LIBPNG_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/libpng
   960   else
       
   961     LIBSPLASHSCREEN_EXCLUDES += libpng
  1234   endif
   962   endif
  1235 
   963 
  1236   ifneq ($(OPENJDK_TARGET_OS), macosx)
   964   ifneq ($(OPENJDK_TARGET_OS), macosx)
  1237     LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen
   965     LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libsplashscreen
  1238   else
   966   else
  1239     LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/macosx/native/sun/awt/splashscreen
   967     LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/java.desktop/macosx/native/libsplashscreen
  1240   endif
   968   endif
  1241 
   969 
  1242   LIBSPLASHSCREEN_CFLAGS := -DSPLASHSCREEN -DPNG_NO_MMX_CODE \
   970   LIBSPLASHSCREEN_CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE \
  1243       $(foreach dir, $(LIBSPLASHSCREEN_DIRS), -I$(dir))
   971       $(addprefix -I, $(LIBSPLASHSCREEN_DIRS)) \
       
   972       $(LIBJAVA_HEADER_FLAGS) \
       
   973       #
  1244 
   974 
  1245   ifeq ($(OPENJDK_TARGET_OS), macosx)
   975   ifeq ($(OPENJDK_TARGET_OS), macosx)
  1246     LIBSPLASHSCREEN_CFLAGS := -I$(JDK_TOPDIR)/src/macosx/native/sun/awt/splashscreen \
   976     LIBSPLASHSCREEN_CFLAGS += -F/System/Library/Frameworks/JavaVM.framework/Frameworks
  1247         $(LIBSPLASHSCREEN_CFLAGS)
       
  1248     LIBSPLASHSCREEN_CFLAGS += -DWITH_MACOSX
   977     LIBSPLASHSCREEN_CFLAGS += -DWITH_MACOSX
  1249     LIBSPLASHSCREEN_CFLAGS += -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp
   978     LIBSPLASHSCREEN_CFLAGS += -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxapp
  1250 
   979 
  1251     LIBSPLASHSCREEN_java_awt_SplashScreen.c_CFLAGS := -x objective-c -O0
   980     BUILD_LIBSPLASHSCREEN_java_awt_SplashScreen.c_CFLAGS := -x objective-c -O0
  1252     LIBSPLASHSCREEN_splashscreen_gfx_impl.c_CFLAGS := -x objective-c -O0
   981     BUILD_LIBSPLASHSCREEN_splashscreen_gfx_impl.c_CFLAGS := -x objective-c -O0
  1253     LIBSPLASHSCREEN_splashscreen_gif.c_CFLAGS := -x objective-c -O0
   982     BUILD_LIBSPLASHSCREEN_splashscreen_gif.c_CFLAGS := -x objective-c -O0
  1254     LIBSPLASHSCREEN_splashscreen_impl.c_CFLAGS := -x objective-c -O0
   983     BUILD_LIBSPLASHSCREEN_splashscreen_impl.c_CFLAGS := -x objective-c -O0
  1255     LIBSPLASHSCREEN_splashscreen_jpeg.c_CFLAGS := -x objective-c -O0
   984     BUILD_LIBSPLASHSCREEN_splashscreen_jpeg.c_CFLAGS := -x objective-c -O0
  1256     LIBSPLASHSCREEN_splashscreen_png.c_CFLAGS := -x objective-c -O0
   985     BUILD_LIBSPLASHSCREEN_splashscreen_png.c_CFLAGS := -x objective-c -O0
  1257     LIBSPLASHSCREEN_splashscreen_sys.m_CFLAGS := -O0
   986     BUILD_LIBSPLASHSCREEN_splashscreen_sys.m_CFLAGS := -O0
  1258 
   987 
  1259   else ifeq ($(OPENJDK_TARGET_OS), windows)
   988   else ifeq ($(OPENJDK_TARGET_OS), windows)
  1260     LIBSPLASHSCREEN_CFLAGS += -DWITH_WIN32
   989     LIBSPLASHSCREEN_CFLAGS += -DWITH_WIN32
  1261   else
   990   else
  1262     LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS)
   991     LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS)
  1263   endif
   992   endif
  1264 
   993 
  1265   LIBSPLASHSCREEN_LDFLAGS_SUFFIX :=
   994   LIBSPLASHSCREEN_LDFLAGS_SUFFIX :=
  1266 
   995 
  1267   ifneq ($(USE_EXTERNAL_LIBZ), true)
   996   ifneq ($(USE_EXTERNAL_LIBZ), true)
  1268     LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.8
   997     LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/java.base/share/native/libzip/zlib-1.2.8
  1269     LIBSPLASHSCREEN_CFLAGS += $(ZLIB_CPPFLAGS)
   998     LIBSPLASHSCREEN_CFLAGS += $(ZLIB_CPPFLAGS)
  1270   endif
   999   endif
  1271 
  1000 
  1272   ifeq ($(OPENJDK_TARGET_OS), macosx)
  1001   ifeq ($(OPENJDK_TARGET_OS), macosx)
  1273     LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(LIBM) -lpthread -liconv -losxapp \
  1002     LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(LIBM) -lpthread -liconv -losxapp \
  1279     LIBSPLASHSCREEN_LDFLAGS_SUFFIX += kernel32.lib user32.lib gdi32.lib delayimp.lib -DELAYLOAD:user32.dll
  1008     LIBSPLASHSCREEN_LDFLAGS_SUFFIX += kernel32.lib user32.lib gdi32.lib delayimp.lib -DELAYLOAD:user32.dll
  1280   else
  1009   else
  1281     LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread
  1010     LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread
  1282   endif
  1011   endif
  1283 
  1012 
  1284   $(eval $(call SetupNativeCompilation,LIBSPLASHSCREEN, \
  1013   $(eval $(call SetupNativeCompilation,BUILD_LIBSPLASHSCREEN, \
  1285       LIBRARY := splashscreen, \
  1014       LIBRARY := splashscreen, \
  1286       OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
  1015       OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
  1287       SRC := $(LIBSPLASHSCREEN_DIRS), \
  1016       SRC := $(LIBSPLASHSCREEN_DIRS), \
  1288       EXCLUDE_FILES := imageioJPEG.c jpegdecoder.c pngtest.c, \
  1017       EXCLUDE_FILES := imageioJPEG.c jpegdecoder.c pngtest.c, \
       
  1018       EXCLUDES := $(LIBSPLASHSCREEN_EXCLUDES), \
  1289       LANG := C, \
  1019       LANG := C, \
  1290       OPTIMIZATION := LOW, \
  1020       OPTIMIZATION := LOW, \
  1291       CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \
  1021       CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \
  1292                 $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(PNG_CFLAGS), \
  1022                 $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(PNG_CFLAGS), \
  1293       MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libsplashscreen/mapfile-vers, \
  1023       MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libsplashscreen/mapfile-vers, \
  1294       LDFLAGS := $(LDFLAGS_JDKLIB) \
  1024       LDFLAGS := $(LDFLAGS_JDKLIB) \
  1295           $(call SET_SHARED_LIBRARY_ORIGIN), \
  1025           $(call SET_SHARED_LIBRARY_ORIGIN), \
  1296       LDFLAGS_SUFFIX := $(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ) \
  1026       LDFLAGS_SUFFIX := $(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ) \
  1297                         $(GIFLIB_LDFLAGS) $(LIBJPEG_LDFLAGS) $(PNG_LIBS), \
  1027                         $(GIFLIB_LDFLAGS) $(LIBJPEG_LDFLAGS) $(PNG_LIBS), \
  1298       LDFLAGS_SUFFIX_solaris := -lc, \
  1028       LDFLAGS_SUFFIX_solaris := -lc, \
  1299       VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
  1029       VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
  1300       RC_FLAGS := $(RC_FLAGS) \
  1030       RC_FLAGS := $(RC_FLAGS) \
  1301           -D "JDK_FNAME=splashscreen.dll" \
  1031           -D "JDK_FNAME=splashscreen.dll" \
  1302           -D "JDK_INTERNAL_NAME=splashscreen" \
  1032           -D "JDK_INTERNAL_NAME=splashscreen" \
  1303           -D "JDK_FTYPE=0x2L", \
  1033           -D "JDK_FTYPE=0x2L", \
  1304       OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libsplashscreen, \
  1034       OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libsplashscreen, \
  1305       DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
  1035       DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
  1306 
  1036 
  1307   BUILD_LIBRARIES += $(LIBSPLASHSCREEN)
  1037   DESKTOP_LIBRARIES += $(BUILD_LIBSPLASHSCREEN)
  1308 
  1038 
  1309   ifeq ($(OPENJDK_TARGET_OS), macosx)
  1039   ifeq ($(OPENJDK_TARGET_OS), macosx)
  1310     $(LIBSPLASHSCREEN): $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)osxapp$(SHARED_LIBRARY_SUFFIX)
  1040     $(BUILD_LIBSPLASHSCREEN): $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)osxapp$(SHARED_LIBRARY_SUFFIX)
  1311   endif
  1041   endif
  1312 
  1042 
  1313 endif
  1043 endif
  1314 
  1044 
  1315 ##########################################################################################
  1045 ##########################################################################################
  1316 
  1046 
  1317 ifndef OPENJDK
  1047 ifndef OPENJDK
  1318 
  1048 
  1319   LIBDCPR_SRC_DIRS := \
  1049   LIBDCPR_SRC_DIRS := $(JDK_TOPDIR)/src/closed/java.desktop/share/native/libdcpr
  1320       $(JDK_TOPDIR)/src/closed/share/native/sun/dc/doe \
  1050   LIBDCPR_CFLAGS := $(addprefix -I, $(shell $(FIND) $(LIBDCPR_SRC_DIRS) -type d)) \
  1321       $(JDK_TOPDIR)/src/closed/share/native/sun/dc/path \
  1051       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d/pipe \
  1322       $(JDK_TOPDIR)/src/closed/share/native/sun/dc/pr \
  1052       -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \
  1323       $(JDK_TOPDIR)/src/closed/share/native/sun/dc/util
  1053       -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/libjava \
  1324 
  1054       -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \
  1325   LIBDCPR_CFLAGS := $(foreach dir, $(LIBDCPR_SRC_DIRS), -I$(dir)) \
  1055       #
  1326       -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe
       
  1327 
  1056 
  1328   $(eval $(call SetupNativeCompilation,BUILD_LIBDCPR, \
  1057   $(eval $(call SetupNativeCompilation,BUILD_LIBDCPR, \
  1329       LIBRARY := dcpr, \
  1058       LIBRARY := dcpr, \
  1330       OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
  1059       OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
  1331       SRC := $(LIBDCPR_SRC_DIRS), \
  1060       SRC := $(LIBDCPR_SRC_DIRS), \
  1337       LDFLAGS := $(LDFLAGS_JDKLIB) \
  1066       LDFLAGS := $(LDFLAGS_JDKLIB) \
  1338           $(call SET_SHARED_LIBRARY_ORIGIN), \
  1067           $(call SET_SHARED_LIBRARY_ORIGIN), \
  1339       LDFLAGS_SUFFIX := $(LIBM) $(LDFLAGS_JDKLIB_SUFFIX), \
  1068       LDFLAGS_SUFFIX := $(LIBM) $(LDFLAGS_JDKLIB_SUFFIX), \
  1340       LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB), \
  1069       LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB), \
  1341       LDFLAGS_SUFFIX_posix := -lm, \
  1070       LDFLAGS_SUFFIX_posix := -lm, \
  1342       VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
  1071       VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
  1343       RC_FLAGS := $(RC_FLAGS) \
  1072       RC_FLAGS := $(RC_FLAGS) \
  1344           -D "JDK_FNAME=dcpr.dll" \
  1073           -D "JDK_FNAME=dcpr.dll" \
  1345           -D "JDK_INTERNAL_NAME=dcpr" \
  1074           -D "JDK_INTERNAL_NAME=dcpr" \
  1346           -D "JDK_FTYPE=0x2L", \
  1075           -D "JDK_FTYPE=0x2L", \
  1347       OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libdcpr, \
  1076       OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libdcpr, \
  1348       DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
  1077       DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
  1349 
  1078 
  1350   $(BUILD_LIBDCPR): $(BUILD_LIBJAVA)
  1079   $(BUILD_LIBDCPR): $(BUILD_LIBJAVA)
  1351 
  1080 
  1352   BUILD_LIBRARIES += $(BUILD_LIBDCPR)
  1081   DESKTOP_LIBRARIES += $(BUILD_LIBDCPR)
  1353 
  1082 
  1354 endif
  1083 endif
  1355 
  1084 
  1356 ##########################################################################################
  1085 ##########################################################################################
  1357 
  1086 
  1358 ifeq ($(OPENJDK_TARGET_OS), macosx)
  1087 ifeq ($(OPENJDK_TARGET_OS), macosx)
  1359 
  1088 
  1360   LIBAWT_LWAWT_FILES := \
       
  1361       AWT_debug.m \
       
  1362       ApplicationDelegate.m \
       
  1363       CFRetainedResource.m \
       
  1364       CGLGraphicsConfig.m \
       
  1365       CGLSurfaceData.m \
       
  1366       CGLLayer.m \
       
  1367       CGraphicsConfig.m \
       
  1368       CGraphicsDevice.m \
       
  1369       CGraphicsEnv.m \
       
  1370       CCharToGlyphMapper.m \
       
  1371       CSystemColors.m \
       
  1372       AWTFont.m \
       
  1373       CGGlyphOutlines.m \
       
  1374       CGGlyphImages.m \
       
  1375       CoreTextSupport.m \
       
  1376       AWTStrike.m \
       
  1377       InitIDs.m \
       
  1378       AWTEvent.m \
       
  1379       AWTView.m \
       
  1380       AWTWindow.m \
       
  1381       AWTSurfaceLayers.m \
       
  1382       CCursorManager.m \
       
  1383       CClipboard.m \
       
  1384       CDataTransferer.m \
       
  1385       CDragSource.m \
       
  1386       CDragSourceContextPeer.m \
       
  1387       CDropTarget.m \
       
  1388       CDropTargetContextPeer.m \
       
  1389       CInputMethod.m \
       
  1390       CDesktopPeer.m \
       
  1391       OSVersion.m \
       
  1392       DnDUtilities.m \
       
  1393       CFileDialog.m \
       
  1394       CImage.m \
       
  1395       CMenu.m \
       
  1396       CMenuBar.m \
       
  1397       CMenuComponent.m \
       
  1398       CMenuItem.m \
       
  1399       CPopupMenu.m \
       
  1400       CRobot.m \
       
  1401       CTrayIcon.m \
       
  1402       CWrapper.m \
       
  1403       JavaAccessibilityAction.m \
       
  1404       JavaAccessibilityUtilities.m \
       
  1405       JavaComponentAccessibility.m \
       
  1406       JavaTextAccessibility.m \
       
  1407       LWCToolkit.m \
       
  1408       GeomUtilities.m \
       
  1409       CPrinterJob.m \
       
  1410       PrintModel.m \
       
  1411       PrinterSurfaceData.m \
       
  1412       PrinterView.m \
       
  1413       QuartzSurfaceData.m \
       
  1414       QuartzRenderer.m \
       
  1415       CTextPipe.m \
       
  1416       ImageSurfaceData.m \
       
  1417       awt_DrawingSurface.m \
       
  1418       \
       
  1419       OGLBlitLoops.c \
       
  1420       OGLBufImgOps.c \
       
  1421       OGLContext.c \
       
  1422       OGLFuncs.c \
       
  1423       OGLMaskBlit.c \
       
  1424       OGLMaskFill.c \
       
  1425       OGLPaints.c \
       
  1426       OGLRenderQueue.c \
       
  1427       OGLRenderer.c \
       
  1428       OGLSurfaceData.c \
       
  1429       OGLTextRenderer.c \
       
  1430       OGLVertexCache.c \
       
  1431       AccelGlyphCache.c \
       
  1432       CUPSfuncs.c
       
  1433 
       
  1434 
       
  1435   LIBAWT_LWAWT_DIRS := \
  1089   LIBAWT_LWAWT_DIRS := \
  1436       $(JDK_TOPDIR)/src/macosx/native/sun/awt \
  1090       $(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt \
  1437       $(JDK_TOPDIR)/src/macosx/native/sun/font \
  1091       $(JDK_TOPDIR)/src/java.desktop/unix/native/common/sun/awt \
  1438       $(JDK_TOPDIR)/src/macosx/native/sun/java2d/opengl \
  1092       $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/font \
  1439       $(JDK_TOPDIR)/src/solaris/native/sun/awt \
  1093       $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/java2d/opengl \
  1440       $(JDK_TOPDIR)/src/share/native/sun/font \
  1094       #
  1441       $(JDK_TOPDIR)/src/share/native/sun/java2d/opengl \
  1095 
       
  1096   LIBAWT_LWAWT_CFLAGS := \
       
  1097       $(addprefix -I, $(LIBAWT_LWAWT_DIRS)) \
       
  1098       -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \
       
  1099       -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/include \
       
  1100       -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \
       
  1101       -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/sun/java2d/opengl \
       
  1102       -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/sun/awt \
       
  1103       -I$(JDK_TOPDIR)/src/java.desktop/unix/native/libawt_xawt/sun/awt \
       
  1104       -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/sun/font \
       
  1105       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/awt/image \
       
  1106       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d \
       
  1107       -I$(JDK_TOPDIR)/src/java.desktop/unix/native/libawt/sun/java2d \
       
  1108       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libmlib_image/ \
       
  1109       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/awt/image/cvutils \
       
  1110       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d/loops \
       
  1111       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d/pipe \
       
  1112       -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/debug \
       
  1113       -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxapp \
       
  1114       $(LIBJAVA_HEADER_FLAGS) \
       
  1115       #
       
  1116 
       
  1117   LIBAWT_LWAWT_EXFILES := fontpath.c awt_Font.c X11Color.c initIDs.c
       
  1118   LIBAWT_LWAWT_EXCLUDES := $(JDK_TOPDIR)/src/java.desktop/unix/native/common/sun/awt/medialib
  1442 
  1119 
  1443   $(eval $(call SetupNativeCompilation,BUILD_LIBAWT_LWAWT, \
  1120   $(eval $(call SetupNativeCompilation,BUILD_LIBAWT_LWAWT, \
  1444       LIBRARY := awt_lwawt, \
  1121       LIBRARY := awt_lwawt, \
  1445       OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
  1122       OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
  1446       SRC := $(LIBAWT_LWAWT_DIRS), \
  1123       SRC := $(LIBAWT_LWAWT_DIRS), \
  1447       LANG := C, \
  1124       LANG := C, \
  1448       INCLUDE_FILES := $(LIBAWT_LWAWT_FILES), \
  1125       INCLUDE_FILES := $(LIBAWT_LWAWT_FILES), \
       
  1126       EXCLUDE_FILES := $(LIBAWT_LWAWT_EXFILES), \
       
  1127       EXCLUDES := $(LIBAWT_LWAWT_EXCLUDES), \
  1449       OPTIMIZATION := LOW, \
  1128       OPTIMIZATION := LOW, \
  1450       CFLAGS := $(CFLAGS_JDKLIB) \
  1129       CFLAGS := $(CFLAGS_JDKLIB) \
  1451           $(X_CFLAGS) \
  1130           $(X_CFLAGS) \
  1452           $(X_LIBS) \
  1131           $(X_LIBS) \
  1453           $(foreach dir, $(LIBAWT_LWAWT_DIRS), -I$(dir)) \
  1132           $(LIBAWT_LWAWT_CFLAGS), \
  1454           -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp \
       
  1455           -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
       
  1456           -I$(JDK_TOPDIR)/src/solaris/native/sun/java2d \
       
  1457           -I$(JDK_TOPDIR)/src/share/native/sun/awt/image \
       
  1458           -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
       
  1459           -I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \
       
  1460           -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \
       
  1461           -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug, \
       
  1462       LDFLAGS := $(LDFLAGS_JDKLIB) \
  1133       LDFLAGS := $(LDFLAGS_JDKLIB) \
  1463           $(call SET_SHARED_LIBRARY_ORIGIN), \
  1134           $(call SET_SHARED_LIBRARY_ORIGIN), \
  1464       LDFLAGS_SUFFIX_macosx := -lawt -lmlib_image -losxapp -ljvm $(LIBM) \
  1135       LDFLAGS_SUFFIX_macosx := -lawt -lmlib_image -losxapp -ljvm $(LIBM) \
  1465           -framework Accelerate \
  1136           -framework Accelerate \
  1466           -framework ApplicationServices \
  1137           -framework ApplicationServices \
  1474           -framework OpenGL \
  1145           -framework OpenGL \
  1475           -framework QuartzCore -ljava, \
  1146           -framework QuartzCore -ljava, \
  1476       OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libawt_lwawt, \
  1147       OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libawt_lwawt, \
  1477       DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
  1148       DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
  1478 
  1149 
  1479   BUILD_LIBRARIES += $(BUILD_LIBAWT_LWAWT)
  1150   DESKTOP_LIBRARIES += $(BUILD_LIBAWT_LWAWT)
  1480 
  1151 
  1481   $(BUILD_LIBAWT_LWAWT): $(BUILD_LIBAWT)
  1152   $(BUILD_LIBAWT_LWAWT): $(BUILD_LIBAWT)
  1482 
  1153 
  1483   $(BUILD_LIBAWT_LWAWT): $(BUILD_LIBMLIB_IMAGE)
  1154   $(BUILD_LIBAWT_LWAWT): $(BUILD_LIBMLIB_IMAGE)
  1484 
  1155 
  1493 ifeq ($(OPENJDK_TARGET_OS), macosx)
  1164 ifeq ($(OPENJDK_TARGET_OS), macosx)
  1494 
  1165 
  1495   $(eval $(call SetupNativeCompilation,BUILD_LIBOSXUI, \
  1166   $(eval $(call SetupNativeCompilation,BUILD_LIBOSXUI, \
  1496       LIBRARY := osxui, \
  1167       LIBRARY := osxui, \
  1497       OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
  1168       OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
  1498       SRC := $(JDK_TOPDIR)/src/macosx/native/com/apple/laf, \
  1169       SRC := $(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxui, \
  1499       LANG := C, \
  1170       LANG := C, \
  1500       OPTIMIZATION := LOW, \
  1171       OPTIMIZATION := LOW, \
  1501       CFLAGS := $(CFLAGS_JDKLIB) \
  1172       CFLAGS := $(CFLAGS_JDKLIB) \
  1502           -I$(JDK_TOPDIR)/src/macosx/native/com/apple/laf \
  1173           -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxui \
  1503           -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp \
  1174           -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/sun/awt \
  1504           -I$(JDK_TOPDIR)/src/macosx/native/sun/awt, \
  1175           -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxapp \
       
  1176           -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \
       
  1177           -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/libjava \
       
  1178           -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop,  \
  1505       LDFLAGS := $(LDFLAGS_JDKLIB) \
  1179       LDFLAGS := $(LDFLAGS_JDKLIB) \
  1506           $(call SET_SHARED_LIBRARY_ORIGIN) \
  1180           $(call SET_SHARED_LIBRARY_ORIGIN) \
  1507           -Xlinker -rpath -Xlinker @loader_path, \
  1181           -Xlinker -rpath -Xlinker @loader_path, \
  1508       LDFLAGS_SUFFIX_macosx := -lawt -losxapp -lawt_lwawt \
  1182       LDFLAGS_SUFFIX_macosx := -lawt -losxapp -lawt_lwawt \
  1509           -framework Cocoa \
  1183           -framework Cocoa \
  1513           -framework JavaRuntimeSupport \
  1187           -framework JavaRuntimeSupport \
  1514           -ljava -ljvm, \
  1188           -ljava -ljvm, \
  1515       OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libosxui, \
  1189       OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libosxui, \
  1516       DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
  1190       DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
  1517 
  1191 
  1518   BUILD_LIBRARIES += $(BUILD_LIBOSXUI)
  1192   DESKTOP_LIBRARIES += $(BUILD_LIBOSXUI)
  1519 
  1193 
  1520   $(BUILD_LIBOSXUI): $(BUILD_LIBAWT)
  1194   $(BUILD_LIBOSXUI): $(BUILD_LIBAWT)
  1521 
  1195 
  1522   $(BUILD_LIBOSXUI): $(BUILD_LIBOSXAPP)
  1196   $(BUILD_LIBOSXUI): $(BUILD_LIBOSXAPP)
  1523 
  1197