jdk Sdiff make/lib

< prev index next >

make/lib/Awt2dLibraries.gmk

 270 ))
 271 
 272 $(BUILD_LIBAWT): $(call FindLib, java.base, java)
 273 
 274 ifeq ($(OPENJDK_TARGET_OS), macosx)
 275   $(BUILD_LIBAWT): $(BUILD_LIBMLIB_IMAGE)
 276 endif
 277 
 278 TARGETS += $(BUILD_LIBAWT)
 279 
 280 ################################################################################
 281 
 282 ifeq ($(findstring $(OPENJDK_TARGET_OS),windows macosx),)
 283   ifeq ($(ENABLE_HEADLESS_ONLY), false)
 284 
 285     LIBAWT_XAWT_DIRS := \
 286         $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt_xawt \
 287         $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \
 288         $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/utility \
 289         $(JDK_TOPDIR)/src/java.desktop/share/native/common/font \
 290         $(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \
 291         $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d/opengl \
 292         $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d/x11 \
 293         $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
 294         #
 295 
 296     ifneq ($(filter $(OPENJDK_TARGET_OS),linux solaris aix), )
 297       LIBAWT_XAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/unix/native/common/awt/systemscale
 298     endif
 299 
 300     LIBAWT_XAWT_EXCLUDES := medialib
 301 
 302     LIBAWT_XAWT_CFLAGS := $(addprefix -I, $(shell $(FIND) $(LIBAWT_XAWT_DIRS) -type d)) \
 303         -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
 304         -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \
 305         -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/include \
 306         -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/include \
 307         -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d \
 308         -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/java2d \
 309         -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/loops \
 310         -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/pipe \
 311         -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \
 312         -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image \

 499     VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
 500     RC_FLAGS := $(RC_FLAGS) \
 501         -D "JDK_FNAME=javajpeg.dll" \
 502         -D "JDK_INTERNAL_NAME=javajpeg" \
 503         -D "JDK_FTYPE=0x2L", \
 504     REORDER := $(BUILD_LIBJAVAJPEG_REORDER), \
 505     OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjavajpeg, \
 506 ))
 507 
 508 $(BUILD_LIBJAVAJPEG): $(call FindLib, java.base, java)
 509 
 510 TARGETS += $(BUILD_LIBJAVAJPEG)
 511 
 512 ################################################################################
 513 
 514 # Mac and Windows only use the native AWT lib, do not build libawt_headless
 515 ifeq ($(findstring $(OPENJDK_TARGET_OS), windows macosx),)
 516 
 517   LIBAWT_HEADLESS_DIRS := $(JDK_TOPDIR)/src/java.desktop/unix/native/libawt_headless/awt \
 518       $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
 519       $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d/opengl \
 520       $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d/x11 \
 521       $(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \
 522       $(JDK_TOPDIR)/src/java.desktop/share/native/common/font \
 523       #
 524 
 525   LIBAWT_HEADLESS_EXCLUDES := medialib
 526   LIBAWT_HEADLESS_CFLAGS := -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
 527       $(addprefix -I, $(LIBAWT_HEADLESS_DIRS)) \


 528       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d \

 529       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/loops \
 530       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \
 531       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/pipe \
 532       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image \
 533       -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/java2d \
 534       -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/font \
 535       -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \

 536       -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/font \


 537       -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libsunwjdga/ \
 538       $(LIBJAVA_HEADER_FLAGS) \
 539       #
 540 
 541   LIBAWT_HEADLESS_REORDER :=
 542   ifeq ($(OPENJDK_TARGET_OS), solaris)
 543     ifneq ($(OPENJDK_TARGET_CPU), x86_64)
 544       LIBAWT_HEADLESS_REORDER := $(JDK_TOPDIR)/make/mapfiles/libawt_headless/reorder-$(OPENJDK_TARGET_CPU)
 545     endif
 546   endif
 547 
 548   $(eval $(call SetupNativeCompilation,BUILD_LIBAWT_HEADLESS, \
 549       LIBRARY := awt_headless, \
 550       OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
 551       SRC := $(LIBAWT_HEADLESS_DIRS), \
 552       EXCLUDES := $(LIBAWT_HEADLESS_EXCLUDES), \
 553       OPTIMIZATION := LOW, \
 554       CFLAGS := $(CFLAGS_JDKLIB) \
 555           -DHEADLESS=true \
 556           -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \

 935           -D "JDK_FTYPE=0x2L", \
 936       OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libsplashscreen, \
 937   ))
 938 
 939   TARGETS += $(BUILD_LIBSPLASHSCREEN)
 940 
 941   ifeq ($(OPENJDK_TARGET_OS), macosx)
 942     $(BUILD_LIBSPLASHSCREEN): $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)osxapp$(SHARED_LIBRARY_SUFFIX)
 943   endif
 944 
 945 endif
 946 
 947 ################################################################################
 948 
 949 ifeq ($(OPENJDK_TARGET_OS), macosx)
 950 
 951   LIBAWT_LWAWT_DIRS := \
 952       $(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt \
 953       $(JDK_TOPDIR)/src/java.desktop/unix/native/common/awt \
 954       $(JDK_TOPDIR)/src/java.desktop/share/native/common/font \
 955       $(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \
 956       #
 957 
 958   LIBAWT_LWAWT_CFLAGS := \
 959       $(addprefix -I, $(LIBAWT_LWAWT_DIRS)) \
 960       -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
 961       -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/include \
 962       -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \
 963       -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl \
 964       -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/awt \
 965       -I$(JDK_TOPDIR)/src/java.desktop/unix/native/libawt_xawt/awt \
 966       -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/font \





 967       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image \

 968       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d \
 969       -I$(JDK_TOPDIR)/src/java.desktop/unix/native/libawt/java2d \
 970       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libmlib_image/ \
 971       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \
 972       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/loops \
 973       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/pipe \
 974       -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \
 975       -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxapp \
 976       $(LIBJAVA_HEADER_FLAGS) \
 977       #
 978 
 979   LIBAWT_LWAWT_EXFILES := fontpath.c awt_Font.c X11Color.c
 980   LIBAWT_LWAWT_EXCLUDES := $(JDK_TOPDIR)/src/java.desktop/unix/native/common/awt/medialib
 981 
 982   $(eval $(call SetupNativeCompilation,BUILD_LIBAWT_LWAWT, \
 983       LIBRARY := awt_lwawt, \
 984       OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
 985       SRC := $(LIBAWT_LWAWT_DIRS), \
 986       INCLUDE_FILES := $(LIBAWT_LWAWT_FILES), \
 987       EXCLUDE_FILES := $(LIBAWT_LWAWT_EXFILES), \
 988       EXCLUDES := $(LIBAWT_LWAWT_EXCLUDES), \
 989       OPTIMIZATION := LOW, \
 990       CFLAGS := $(CFLAGS_JDKLIB) \
 991           $(X_CFLAGS) \
 992           $(X_LIBS) \
 993           $(LIBAWT_LWAWT_CFLAGS), \
 994       DISABLED_WARNINGS_clang := incomplete-implementation enum-conversion \

 270 ))
 271 
 272 $(BUILD_LIBAWT): $(call FindLib, java.base, java)
 273 
 274 ifeq ($(OPENJDK_TARGET_OS), macosx)
 275   $(BUILD_LIBAWT): $(BUILD_LIBMLIB_IMAGE)
 276 endif
 277 
 278 TARGETS += $(BUILD_LIBAWT)
 279 
 280 ################################################################################
 281 
 282 ifeq ($(findstring $(OPENJDK_TARGET_OS),windows macosx),)
 283   ifeq ($(ENABLE_HEADLESS_ONLY), false)
 284 
 285     LIBAWT_XAWT_DIRS := \
 286         $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt_xawt \
 287         $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \
 288         $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/utility \
 289         $(JDK_TOPDIR)/src/java.desktop/share/native/common/font \
 290         $(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d \
 291         $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d \

 292         $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
 293         #
 294 
 295     ifneq ($(filter $(OPENJDK_TARGET_OS),linux solaris aix), )
 296       LIBAWT_XAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/unix/native/common/awt/systemscale
 297     endif
 298 
 299     LIBAWT_XAWT_EXCLUDES := medialib
 300 
 301     LIBAWT_XAWT_CFLAGS := $(addprefix -I, $(shell $(FIND) $(LIBAWT_XAWT_DIRS) -type d)) \
 302         -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
 303         -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \
 304         -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/include \
 305         -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/include \
 306         -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d \
 307         -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/java2d \
 308         -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/loops \
 309         -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/pipe \
 310         -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \
 311         -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image \

 498     VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
 499     RC_FLAGS := $(RC_FLAGS) \
 500         -D "JDK_FNAME=javajpeg.dll" \
 501         -D "JDK_INTERNAL_NAME=javajpeg" \
 502         -D "JDK_FTYPE=0x2L", \
 503     REORDER := $(BUILD_LIBJAVAJPEG_REORDER), \
 504     OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjavajpeg, \
 505 ))
 506 
 507 $(BUILD_LIBJAVAJPEG): $(call FindLib, java.base, java)
 508 
 509 TARGETS += $(BUILD_LIBJAVAJPEG)
 510 
 511 ################################################################################
 512 
 513 # Mac and Windows only use the native AWT lib, do not build libawt_headless
 514 ifeq ($(findstring $(OPENJDK_TARGET_OS), windows macosx),)
 515 
 516   LIBAWT_HEADLESS_DIRS := $(JDK_TOPDIR)/src/java.desktop/unix/native/libawt_headless/awt \
 517       $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
 518       $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d \
 519       $(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d \

 520       $(JDK_TOPDIR)/src/java.desktop/share/native/common/font \
 521       #
 522 
 523   LIBAWT_HEADLESS_EXCLUDES := medialib
 524   LIBAWT_HEADLESS_CFLAGS := -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
 525       $(addprefix -I, $(LIBAWT_HEADLESS_DIRS)) \
 526       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image \
 527       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \
 528       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d \
 529       -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/java2d \
 530       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/loops \

 531       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/pipe \



 532       -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \
 533       -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/font \
 534       -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/font \
 535       -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \
 536       -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d/opengl \
 537       -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libsunwjdga/ \
 538       $(LIBJAVA_HEADER_FLAGS) \
 539       #
 540 
 541   LIBAWT_HEADLESS_REORDER :=
 542   ifeq ($(OPENJDK_TARGET_OS), solaris)
 543     ifneq ($(OPENJDK_TARGET_CPU), x86_64)
 544       LIBAWT_HEADLESS_REORDER := $(JDK_TOPDIR)/make/mapfiles/libawt_headless/reorder-$(OPENJDK_TARGET_CPU)
 545     endif
 546   endif
 547 
 548   $(eval $(call SetupNativeCompilation,BUILD_LIBAWT_HEADLESS, \
 549       LIBRARY := awt_headless, \
 550       OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
 551       SRC := $(LIBAWT_HEADLESS_DIRS), \
 552       EXCLUDES := $(LIBAWT_HEADLESS_EXCLUDES), \
 553       OPTIMIZATION := LOW, \
 554       CFLAGS := $(CFLAGS_JDKLIB) \
 555           -DHEADLESS=true \
 556           -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \

 935           -D "JDK_FTYPE=0x2L", \
 936       OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libsplashscreen, \
 937   ))
 938 
 939   TARGETS += $(BUILD_LIBSPLASHSCREEN)
 940 
 941   ifeq ($(OPENJDK_TARGET_OS), macosx)
 942     $(BUILD_LIBSPLASHSCREEN): $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)osxapp$(SHARED_LIBRARY_SUFFIX)
 943   endif
 944 
 945 endif
 946 
 947 ################################################################################
 948 
 949 ifeq ($(OPENJDK_TARGET_OS), macosx)
 950 
 951   LIBAWT_LWAWT_DIRS := \
 952       $(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt \
 953       $(JDK_TOPDIR)/src/java.desktop/unix/native/common/awt \
 954       $(JDK_TOPDIR)/src/java.desktop/share/native/common/font \
 955       $(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d \
 956       #
 957 
 958   LIBAWT_LWAWT_CFLAGS := \
 959       $(addprefix -I, $(LIBAWT_LWAWT_DIRS)) \
 960       -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \



 961       -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/awt \
 962       -I$(JDK_TOPDIR)/src/java.desktop/unix/native/libawt_xawt/awt \
 963       -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/font \
 964       -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl \
 965       -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \
 966       -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \
 967       -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/include \
 968       -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \
 969       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image \
 970       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \
 971       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d \
 972       -I$(JDK_TOPDIR)/src/java.desktop/unix/native/libawt/java2d \


 973       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/loops \
 974       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/pipe \
 975       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libmlib_image/ \
 976       -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxapp \
 977       $(LIBJAVA_HEADER_FLAGS) \
 978       #
 979 
 980   LIBAWT_LWAWT_EXFILES := fontpath.c awt_Font.c X11Color.c
 981   LIBAWT_LWAWT_EXCLUDES := $(JDK_TOPDIR)/src/java.desktop/unix/native/common/awt/medialib
 982 
 983   $(eval $(call SetupNativeCompilation,BUILD_LIBAWT_LWAWT, \
 984       LIBRARY := awt_lwawt, \
 985       OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
 986       SRC := $(LIBAWT_LWAWT_DIRS), \
 987       INCLUDE_FILES := $(LIBAWT_LWAWT_FILES), \
 988       EXCLUDE_FILES := $(LIBAWT_LWAWT_EXFILES), \
 989       EXCLUDES := $(LIBAWT_LWAWT_EXCLUDES), \
 990       OPTIMIZATION := LOW, \
 991       CFLAGS := $(CFLAGS_JDKLIB) \
 992           $(X_CFLAGS) \
 993           $(X_LIBS) \
 994           $(LIBAWT_LWAWT_CFLAGS), \
 995       DISABLED_WARNINGS_clang := incomplete-implementation enum-conversion \

< prev index next >