jdk/make/lib/Awt2dLibraries.gmk
changeset 26751 70bac69b37c9
parent 26741 bc80bcd0765a
child 27736 8c9bd4be4a86
child 27565 729f9700483a
equal deleted inserted replaced
26750:d0d6c64a2e2b 26751:70bac69b37c9
    26 WIN_AWT_LIB := $(JDK_OUTPUTDIR)/objs/libawt/awt.lib
    26 WIN_AWT_LIB := $(JDK_OUTPUTDIR)/objs/libawt/awt.lib
    27 
    27 
    28 ################################################################################
    28 ################################################################################
    29 
    29 
    30 BUILD_LIBMLIB_SRC := $(JDK_TOPDIR)/src/java.desktop/share/native/libmlib_image \
    30 BUILD_LIBMLIB_SRC := $(JDK_TOPDIR)/src/java.desktop/share/native/libmlib_image \
    31     $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/medialib
    31     $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/medialib
    32 BUILD_LIBMLIB_CFLAGS := -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES \
    32 BUILD_LIBMLIB_CFLAGS := -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES \
    33     $(addprefix -I, $(BUILD_LIBMLIB_SRC)) \
    33     $(addprefix -I, $(BUILD_LIBMLIB_SRC)) \
    34     -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libmlib_image
    34     -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libmlib_image
    35 
    35 
    36 BUILD_LIBMLIB_LDLIBS :=
    36 BUILD_LIBMLIB_LDLIBS :=
    77 
    77 
    78 ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc)
    78 ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc)
    79 
    79 
    80   LIBMLIB_IMAGE_V_SRC := $(JDK_TOPDIR)/src/java.desktop/share/native/libmlib_image \
    80   LIBMLIB_IMAGE_V_SRC := $(JDK_TOPDIR)/src/java.desktop/share/native/libmlib_image \
    81       $(JDK_TOPDIR)/src/java.desktop/unix/native/libmlib_image \
    81       $(JDK_TOPDIR)/src/java.desktop/unix/native/libmlib_image \
    82       $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/medialib \
    82       $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/medialib \
    83       $(JDK_TOPDIR)/src/java.desktop/unix/native/common/sun/awt/medialib \
    83       $(JDK_TOPDIR)/src/java.desktop/unix/native/common/awt/medialib \
    84       #
    84       #
    85   LIBMLIB_IMAGE_V_CFLAGS := $(JDK_TOPDIR)/src/java.desktop/unix/native/libmlib_image/vis_$(OPENJDK_TARGET_CPU_BITS).il \
    85   LIBMLIB_IMAGE_V_CFLAGS := $(JDK_TOPDIR)/src/java.desktop/unix/native/libmlib_image/vis_$(OPENJDK_TARGET_CPU_BITS).il \
    86       $(addprefix -I, $(LIBMLIB_IMAGE_V_SRC)) \
    86       $(addprefix -I, $(LIBMLIB_IMAGE_V_SRC)) \
    87       #
    87       #
    88 
    88 
   143 
   143 
   144 ################################################################################
   144 ################################################################################
   145 
   145 
   146 LIBAWT_DIRS := $(JDK_TOPDIR)/src/java.desktop/share/native/libawt \
   146 LIBAWT_DIRS := $(JDK_TOPDIR)/src/java.desktop/share/native/libawt \
   147     $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt \
   147     $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt \
   148     $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/debug \
   148     $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \
   149     $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/awt \
   149     $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/awt \
   150     #
   150     #
   151 
   151 
   152 ifeq ($(OPENJDK_TARGET_OS), aix)
   152 ifeq ($(OPENJDK_TARGET_OS), aix)
   153   LIBAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/libawt
   153   LIBAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/libawt
   154 endif
   154 endif
   155 
   155 
   156 ifeq ($(OPENJDK_TARGET_OS), windows)
   156 ifeq ($(OPENJDK_TARGET_OS), windows)
   157   LIBAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/utility
   157   LIBAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/utility
   158 else
   158 else
   159   LIBAWT_EXFILES := sun/java2d/ShaderList.c
   159   LIBAWT_EXFILES := java2d/ShaderList.c
   160 endif
   160 endif
   161 
   161 
   162 ifneq ($(filter $(OPENJDK_TARGET_OS), solaris linux macosx aix), )
   162 ifneq ($(filter $(OPENJDK_TARGET_OS), solaris linux macosx aix), )
   163   LIBAWT_EXFILES += awt_Font.c CUPSfuncs.c fontpath.c X11Color.c
   163   LIBAWT_EXFILES += awt_Font.c CUPSfuncs.c fontpath.c X11Color.c
   164 endif
   164 endif
   165 
   165 
   166 ifeq ($(OPENJDK_TARGET_OS), macosx)
   166 ifeq ($(OPENJDK_TARGET_OS), macosx)
   167   LIBAWT_EXFILES += initIDs.c sun/awt/image/cvutils/img_colors.c
   167   LIBAWT_EXFILES += initIDs.c awt/image/cvutils/img_colors.c
   168 endif
   168 endif
   169 
   169 
   170 LIBAWT_CFLAGS += -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \
   170 LIBAWT_CFLAGS += -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \
   171     $(addprefix -I, $(shell find $(LIBAWT_DIRS) -type d)) \
   171     $(addprefix -I, $(shell find $(LIBAWT_DIRS) -type d)) \
   172     $(LIBJAVA_HEADER_FLAGS) \
   172     $(LIBJAVA_HEADER_FLAGS) \
   181 ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc)
   181 ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc)
   182   LIBAWT_CFLAGS += -DMLIB_ADD_SUFF
   182   LIBAWT_CFLAGS += -DMLIB_ADD_SUFF
   183   LIBAWT_CFLAGS += -xarch=sparcvis
   183   LIBAWT_CFLAGS += -xarch=sparcvis
   184 
   184 
   185   LIBAWT_CFLAGS += $(JDK_TOPDIR)/src/java.desktop/unix/native/libmlib_image/vis_$(OPENJDK_TARGET_CPU_BITS).il
   185   LIBAWT_CFLAGS += $(JDK_TOPDIR)/src/java.desktop/unix/native/libmlib_image/vis_$(OPENJDK_TARGET_CPU_BITS).il
   186   LIBAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/medialib
   186   LIBAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/medialib
   187   LIBAWT_EXFILES += sun/java2d/loops/MapAccelFunc.c
   187   LIBAWT_EXFILES += java2d/loops/MapAccelFunc.c
   188 
   188 
   189   ifeq ($(OPENJDK_TARGET_CPU), sparcv9)
   189   ifeq ($(OPENJDK_TARGET_CPU), sparcv9)
   190     LIBAWT_ASFLAGS = -P -xarch=v9a
   190     LIBAWT_ASFLAGS = -P -xarch=v9a
   191   else
   191   else
   192     LIBAWT_ASFLAGS = -P -xarch=v8plusa
   192     LIBAWT_ASFLAGS = -P -xarch=v8plusa
   193   endif
   193   endif
   194 else
   194 else
   195   LIBAWT_EXCLUDES += \
   195   LIBAWT_EXCLUDES += \
   196       $(JDK_TOPDIR)/src/java.desktop/unix/native/libawt/sun/awt/medialib \
   196       $(JDK_TOPDIR)/src/java.desktop/unix/native/libawt/awt/medialib \
   197       $(JDK_TOPDIR)/src/java.desktop/unix/native/libawt/sun/java2d/loops \
   197       $(JDK_TOPDIR)/src/java.desktop/unix/native/libawt/java2d/loops \
   198       $(JDK_TOPDIR)/src/java.desktop/unix/native/common/sun/awt/medialib \
   198       $(JDK_TOPDIR)/src/java.desktop/unix/native/common/awt/medialib \
   199       #
   199       #
   200 endif
   200 endif
   201 
   201 
   202 ifneq ($(OPENJDK_TARGET_OS), solaris)
   202 ifneq ($(OPENJDK_TARGET_OS), solaris)
   203   LIBAWT_CFLAGS += -DMLIB_NO_LIBSUNMATH
   203   LIBAWT_CFLAGS += -DMLIB_NO_LIBSUNMATH
   204 endif
   204 endif
   205 
   205 
   206 LIBAWT_LANG := C
   206 LIBAWT_LANG := C
   207 
   207 
   208 ifeq ($(OPENJDK_TARGET_OS), windows)
   208 ifeq ($(OPENJDK_TARGET_OS), windows)
   209   LIBAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/font \
   209   LIBAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/common/font \
   210       $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/java2d/opengl \
   210       $(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \
   211   # Why does libawt need java.base headers?
   211   # Why does libawt need java.base headers?
   212   LIBAWT_CFLAGS += -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/font \
   212   LIBAWT_CFLAGS += -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/font \
   213       -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/java2d/opengl \
   213       -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \
   214       -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/java2d/opengl \
   214       -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/java2d/opengl \
   215       -I$(JDK_TOPDIR)/src/java.desktop/windows/native/include \
   215       -I$(JDK_TOPDIR)/src/java.desktop/windows/native/include \
   216       -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \
   216       -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \
   217       -I$(JDK_OUTPUTDIR)/gensrc_headers/java.base \
   217       -I$(JDK_OUTPUTDIR)/gensrc_headers/java.base \
   218       #
   218       #
   219   LIBAWT_EXFILES += \
   219   LIBAWT_EXFILES += \
   220       sun/java2d/d3d/D3DShaderGen.c \
   220       java2d/d3d/D3DShaderGen.c \
   221       sun/awt/image/cvutils/img_colors.c \
   221       awt/image/cvutils/img_colors.c \
   222       #
   222       #
   223 
   223 
   224   LIBAWT_LANG := C++
   224   LIBAWT_LANG := C++
   225   LIBAWT_CFLAGS += -EHsc -DUNICODE -D_UNICODE
   225   LIBAWT_CFLAGS += -EHsc -DUNICODE -D_UNICODE
   226   ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
   226   ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
   230   ifdef OPENJDK
   230   ifdef OPENJDK
   231     LIBAWT_RC_FLAGS := -i "$(JDK_TOPDIR)/src/java.base/windows/native/launcher/icons"
   231     LIBAWT_RC_FLAGS := -i "$(JDK_TOPDIR)/src/java.base/windows/native/launcher/icons"
   232   else
   232   else
   233     LIBAWT_RC_FLAGS := -i "$(JDK_TOPDIR)/src/closed/java.base/windows/native/launcher/icons"
   233     LIBAWT_RC_FLAGS := -i "$(JDK_TOPDIR)/src/closed/java.base/windows/native/launcher/icons"
   234   endif
   234   endif
   235   LIBAWT_VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/java.desktop/windows/native/libawt/sun/windows/awt.rc
   235   LIBAWT_VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/java.desktop/windows/native/libawt/windows/awt.rc
   236 endif
   236 endif
   237 
   237 
   238 ifeq ($(MILESTONE), internal)
   238 ifeq ($(MILESTONE), internal)
   239   LIBAWT_CFLAGS += -DINTERNAL_BUILD
   239   LIBAWT_CFLAGS += -DINTERNAL_BUILD
   240 endif
   240 endif
   298   ifndef BUILD_HEADLESS_ONLY
   298   ifndef BUILD_HEADLESS_ONLY
   299 
   299 
   300     LIBAWT_XAWT_DIRS := \
   300     LIBAWT_XAWT_DIRS := \
   301         $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt_xawt \
   301         $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt_xawt \
   302         $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libjawt \
   302         $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libjawt \
   303         $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/debug \
   303         $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \
   304         $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/utility \
   304         $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/utility \
   305         $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/font \
   305         $(JDK_TOPDIR)/src/java.desktop/share/native/common/font \
   306         $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/java2d/opengl \
   306         $(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \
   307         $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/java2d/opengl \
   307         $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/java2d/opengl \
   308         $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/java2d/x11 \
   308         $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/java2d/x11 \
   309         $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/awt \
   309         $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/awt \
   310         #
   310         #
   311 
   311 
   312     LIBAWT_XAWT_EXCLUDES := medialib
   312     LIBAWT_XAWT_EXCLUDES := medialib
   313 
   313 
   314     LIBAWT_XAWT_CFLAGS := $(addprefix -I, $(shell $(FIND) $(LIBAWT_XAWT_DIRS) -type d)) \
   314     LIBAWT_XAWT_CFLAGS := $(addprefix -I, $(shell $(FIND) $(LIBAWT_XAWT_DIRS) -type d)) \
   315         -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \
   315         -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \
   316         -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \
   316         -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \
   317         -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/include \
   317         -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/include \
   318         -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/include \
   318         -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/include \
   319         -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d \
   319         -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d \
   320         -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt/sun/java2d \
   320         -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt/java2d \
   321         -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d/loops \
   321         -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/loops \
   322         -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d/pipe \
   322         -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/pipe \
   323         -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/awt/image/cvutils \
   323         -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \
   324         -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/awt/image \
   324         -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image \
   325         -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libsunwjdga \
   325         -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libsunwjdga \
   326         -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/font \
   326         -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/font \
   327         $(LIBJAVA_HEADER_FLAGS)
   327         $(LIBJAVA_HEADER_FLAGS)
   328         #
   328         #
   329 
   329 
   330     LIBAWT_XAWT_CFLAGS += -DXAWT -DXAWT_HACK \
   330     LIBAWT_XAWT_CFLAGS += -DXAWT -DXAWT_HACK \
   331         -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \
   331         -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \
   386 
   386 
   387 ################################################################################
   387 ################################################################################
   388 
   388 
   389 LIBLCMS_SRC := $(JDK_TOPDIR)/src/java.desktop/share/native/liblcms
   389 LIBLCMS_SRC := $(JDK_TOPDIR)/src/java.desktop/share/native/liblcms
   390 LIBLCMS_CPPFLAGS += -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \
   390 LIBLCMS_CPPFLAGS += -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \
   391     -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d \
   391     -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d \
   392     -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/debug \
   392     -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \
   393     $(LIBJAVA_HEADER_FLAGS) \
   393     $(LIBJAVA_HEADER_FLAGS) \
   394     #
   394     #
   395 
   395 
   396 ifeq ($(USE_EXTERNAL_LCMS), true)
   396 ifeq ($(USE_EXTERNAL_LCMS), true)
   397   # If we're using an external library, we'll just need the wrapper part.
   397   # If we're using an external library, we'll just need the wrapper part.
   540 
   540 
   541 ifeq ($(OPENJDK_TARGET_OS), windows)
   541 ifeq ($(OPENJDK_TARGET_OS), windows)
   542   LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \
   542   LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \
   543       X11TextRenderer.c
   543       X11TextRenderer.c
   544   LIBFONTMANAGER_OPTIMIZATION := HIGHEST
   544   LIBFONTMANAGER_OPTIMIZATION := HIGHEST
   545   LIBFONTMANAGER_CFLAGS += -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt/sun/windows
   545   LIBFONTMANAGER_CFLAGS += -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt/windows
   546 else ifeq ($(OPENJDK_TARGET_OS), macosx)
   546 else ifeq ($(OPENJDK_TARGET_OS), macosx)
   547   LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \
   547   LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \
   548       X11TextRenderer.c \
   548       X11TextRenderer.c \
   549       fontpath.c \
   549       fontpath.c \
   550       lcdglyph.c
   550       lcdglyph.c
   605 
   605 
   606 ################################################################################
   606 ################################################################################
   607 
   607 
   608 ifeq ($(OPENJDK_TARGET_OS), windows)
   608 ifeq ($(OPENJDK_TARGET_OS), windows)
   609   LIBJAWT_SRC := $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libjawt
   609   LIBJAWT_SRC := $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libjawt
   610   LIBJAWT_CFLAGS := -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt/sun/windows \
   610   LIBJAWT_CFLAGS := -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt/windows \
   611       -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/debug \
   611       -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \
   612       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d \
   612       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d \
   613       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/awt/image/cvutils \
   613       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \
   614       -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt/sun/java2d/windows \
   614       -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt/java2d/windows \
   615       -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \
   615       -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \
   616       -I$(JDK_TOPDIR)/src/java.desktop/windows/native/include \
   616       -I$(JDK_TOPDIR)/src/java.desktop/windows/native/include \
   617       -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \
   617       -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \
   618       $(LIBJAVA_HEADER_FLAGS) \
   618       $(LIBJAVA_HEADER_FLAGS) \
   619       #
   619       #
   656     LIBJAWT_SRC := $(JDK_TOPDIR)/src/java.desktop/macosx/native/libjawt
   656     LIBJAWT_SRC := $(JDK_TOPDIR)/src/java.desktop/macosx/native/libjawt
   657   else
   657   else
   658     LIBJAWT_SRC := $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libjawt
   658     LIBJAWT_SRC := $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libjawt
   659   endif
   659   endif
   660   LIBJAWT_CFLAGS := \
   660   LIBJAWT_CFLAGS := \
   661       -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/awt \
   661       -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/awt \
   662       -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/include \
   662       -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/include \
   663       -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/include \
   663       -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/include \
   664       -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \
   664       -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \
   665       $(LIBJAVA_HEADER_FLAGS) \
   665       $(LIBJAVA_HEADER_FLAGS) \
   666       #
   666       #
   721 
   721 
   722 ifeq ($(BUILD_HEADLESS), true)
   722 ifeq ($(BUILD_HEADLESS), true)
   723   # Mac and Windows only use the native AWT lib, do not build libawt_headless
   723   # Mac and Windows only use the native AWT lib, do not build libawt_headless
   724   ifeq ($(findstring $(OPENJDK_TARGET_OS), windows macosx),)
   724   ifeq ($(findstring $(OPENJDK_TARGET_OS), windows macosx),)
   725 
   725 
   726     LIBAWT_HEADLESS_DIRS := $(JDK_TOPDIR)/src/java.desktop/unix/native/libawt_headless/sun/awt \
   726     LIBAWT_HEADLESS_DIRS := $(JDK_TOPDIR)/src/java.desktop/unix/native/libawt_headless/awt \
   727         $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/awt \
   727         $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/awt \
   728         $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/java2d/opengl \
   728         $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/java2d/opengl \
   729         $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/java2d/x11 \
   729         $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/java2d/x11 \
   730         $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/java2d/opengl \
   730         $(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \
   731         $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/font \
   731         $(JDK_TOPDIR)/src/java.desktop/share/native/common/font \
   732         #
   732         #
   733 
   733 
   734     LIBAWT_HEADLESS_EXCLUDES := medialib
   734     LIBAWT_HEADLESS_EXCLUDES := medialib
   735     LIBAWT_HEADLESS_CFLAGS := -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \
   735     LIBAWT_HEADLESS_CFLAGS := -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \
   736         $(addprefix -I, $(LIBAWT_HEADLESS_DIRS)) \
   736         $(addprefix -I, $(LIBAWT_HEADLESS_DIRS)) \
   737         -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d \
   737         -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d \
   738         -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d/loops \
   738         -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/loops \
   739         -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/awt/image/cvutils \
   739         -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \
   740         -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d/pipe \
   740         -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/pipe \
   741         -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/awt/image \
   741         -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image \
   742         -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt/sun/java2d \
   742         -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt/java2d \
   743         -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/font \
   743         -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/font \
   744         -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/debug \
   744         -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \
   745         -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/font \
   745         -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/font \
   746         -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libsunwjdga/ \
   746         -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libsunwjdga/ \
   747         $(LIBJAVA_HEADER_FLAGS) \
   747         $(LIBJAVA_HEADER_FLAGS) \
   748         #
   748         #
   749 
   749 
   750     LIBAWT_HEADLESS_REORDER :=
   750     LIBAWT_HEADLESS_REORDER :=
   900 
   900 
   901 ifeq ($(OPENJDK_TARGET_OS), macosx)
   901 ifeq ($(OPENJDK_TARGET_OS), macosx)
   902 
   902 
   903   LIBAWT_LWAWT_DIRS := \
   903   LIBAWT_LWAWT_DIRS := \
   904       $(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt \
   904       $(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt \
   905       $(JDK_TOPDIR)/src/java.desktop/unix/native/common/sun/awt \
   905       $(JDK_TOPDIR)/src/java.desktop/unix/native/common/awt \
   906       $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/font \
   906       $(JDK_TOPDIR)/src/java.desktop/share/native/common/font \
   907       $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/java2d/opengl \
   907       $(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \
   908       #
   908       #
   909 
   909 
   910   LIBAWT_LWAWT_CFLAGS := \
   910   LIBAWT_LWAWT_CFLAGS := \
   911       $(addprefix -I, $(LIBAWT_LWAWT_DIRS)) \
   911       $(addprefix -I, $(LIBAWT_LWAWT_DIRS)) \
   912       -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \
   912       -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \
   913       -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/include \
   913       -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/include \
   914       -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \
   914       -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \
   915       -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/sun/java2d/opengl \
   915       -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl \
   916       -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/sun/awt \
   916       -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/awt \
   917       -I$(JDK_TOPDIR)/src/java.desktop/unix/native/libawt_xawt/sun/awt \
   917       -I$(JDK_TOPDIR)/src/java.desktop/unix/native/libawt_xawt/awt \
   918       -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/sun/font \
   918       -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/font \
   919       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/awt/image \
   919       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image \
   920       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d \
   920       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d \
   921       -I$(JDK_TOPDIR)/src/java.desktop/unix/native/libawt/sun/java2d \
   921       -I$(JDK_TOPDIR)/src/java.desktop/unix/native/libawt/java2d \
   922       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libmlib_image/ \
   922       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libmlib_image/ \
   923       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/awt/image/cvutils \
   923       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \
   924       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d/loops \
   924       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/loops \
   925       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d/pipe \
   925       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/pipe \
   926       -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/debug \
   926       -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \
   927       -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxapp \
   927       -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxapp \
   928       $(LIBJAVA_HEADER_FLAGS) \
   928       $(LIBJAVA_HEADER_FLAGS) \
   929       #
   929       #
   930 
   930 
   931   LIBAWT_LWAWT_EXFILES := fontpath.c awt_Font.c X11Color.c
   931   LIBAWT_LWAWT_EXFILES := fontpath.c awt_Font.c X11Color.c
   932   LIBAWT_LWAWT_EXCLUDES := $(JDK_TOPDIR)/src/java.desktop/unix/native/common/sun/awt/medialib
   932   LIBAWT_LWAWT_EXCLUDES := $(JDK_TOPDIR)/src/java.desktop/unix/native/common/awt/medialib
   933 
   933 
   934   $(eval $(call SetupNativeCompilation,BUILD_LIBAWT_LWAWT, \
   934   $(eval $(call SetupNativeCompilation,BUILD_LIBAWT_LWAWT, \
   935       LIBRARY := awt_lwawt, \
   935       LIBRARY := awt_lwawt, \
   936       OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
   936       OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
   937       SRC := $(LIBAWT_LWAWT_DIRS), \
   937       SRC := $(LIBAWT_LWAWT_DIRS), \
   983       SRC := $(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxui, \
   983       SRC := $(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxui, \
   984       LANG := C, \
   984       LANG := C, \
   985       OPTIMIZATION := LOW, \
   985       OPTIMIZATION := LOW, \
   986       CFLAGS := $(CFLAGS_JDKLIB) \
   986       CFLAGS := $(CFLAGS_JDKLIB) \
   987           -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxui \
   987           -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxui \
   988           -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/sun/awt \
   988           -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/awt \
   989           -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxapp \
   989           -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxapp \
   990           -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \
   990           -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \
   991           -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/libjava \
   991           -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/libjava \
   992           -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop,  \
   992           -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop,  \
   993       LDFLAGS := $(LDFLAGS_JDKLIB) \
   993       LDFLAGS := $(LDFLAGS_JDKLIB) \