21 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
21 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
22 # or visit www.oracle.com if you need additional information or have any |
22 # or visit www.oracle.com if you need additional information or have any |
23 # questions. |
23 # questions. |
24 # |
24 # |
25 |
25 |
|
26 $(eval $(call IncludeCustomExtension, jdk, lib/Awt2dLibraries-pre.gmk)) |
|
27 |
26 WIN_AWT_LIB := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libawt/awt.lib |
28 WIN_AWT_LIB := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libawt/awt.lib |
27 |
29 |
28 ################################################################################ |
30 ################################################################################ |
29 |
31 |
30 BUILD_LIBMLIB_SRC := $(JDK_TOPDIR)/src/java.desktop/share/native/libmlib_image \ |
32 BUILD_LIBMLIB_SRC := $(JDK_TOPDIR)/src/java.desktop/share/native/libmlib_image \ |
210 LIBAWT_CFLAGS += -EHsc -DUNICODE -D_UNICODE |
212 LIBAWT_CFLAGS += -EHsc -DUNICODE -D_UNICODE |
211 ifeq ($(OPENJDK_TARGET_CPU_BITS), 64) |
213 ifeq ($(OPENJDK_TARGET_CPU_BITS), 64) |
212 LIBAWT_CFLAGS += -DMLIB_OS64BIT |
214 LIBAWT_CFLAGS += -DMLIB_OS64BIT |
213 endif |
215 endif |
214 |
216 |
215 ifdef OPENJDK |
217 LIBAWT_RC_FLAGS ?= -I $(JDK_TOPDIR)/src/java.base/windows/native/launcher/icons |
216 LIBAWT_RC_FLAGS := -I $(JDK_TOPDIR)/src/java.base/windows/native/launcher/icons |
|
217 else |
|
218 LIBAWT_RC_FLAGS := -I $(JDK_TOPDIR)/src/closed/java.base/windows/native/launcher/icons |
|
219 endif |
|
220 LIBAWT_VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/java.desktop/windows/native/libawt/windows/awt.rc |
218 LIBAWT_VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/java.desktop/windows/native/libawt/windows/awt.rc |
221 endif |
219 endif |
222 |
220 |
223 LIBAWT_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libawt/mapfile-vers |
221 LIBAWT_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libawt/mapfile-vers |
224 ifeq ($(OPENJDK_TARGET_OS), linux) |
222 ifeq ($(OPENJDK_TARGET_OS), linux) |
452 |
450 |
453 $(BUILD_LIBLCMS): $(BUILD_LIBAWT) |
451 $(BUILD_LIBLCMS): $(BUILD_LIBAWT) |
454 |
452 |
455 ################################################################################ |
453 ################################################################################ |
456 |
454 |
457 ifdef OPENJDK |
|
458 BUILD_LIBJAVAJPEG_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjpeg/mapfile-vers |
|
459 else |
|
460 BUILD_LIBJAVAJPEG_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjpeg/mapfile-vers-closed |
|
461 LIBJAVAJPEG_SRC += $(JDK_TOPDIR)/src/closed/java.desktop/share/native/libjavajpeg |
|
462 endif |
|
463 |
|
464 LIBJAVAJPEG_SRC += $(JDK_TOPDIR)/src/java.desktop/share/native/libjavajpeg |
455 LIBJAVAJPEG_SRC += $(JDK_TOPDIR)/src/java.desktop/share/native/libjavajpeg |
465 |
456 |
466 BUILD_LIBJAVAJPEG_REORDER := |
457 BUILD_LIBJAVAJPEG_REORDER := |
467 ifeq ($(OPENJDK_TARGET_OS), solaris) |
458 ifeq ($(OPENJDK_TARGET_OS), solaris) |
468 ifneq ($(OPENJDK_TARGET_CPU), x86_64) |
459 ifneq ($(OPENJDK_TARGET_CPU), x86_64) |
508 $(LIBJAVA_HEADER_FLAGS) \ |
499 $(LIBJAVA_HEADER_FLAGS) \ |
509 -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop, \ |
500 -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop, \ |
510 DISABLED_WARNINGS_gcc := clobbered parentheses array-bounds, \ |
501 DISABLED_WARNINGS_gcc := clobbered parentheses array-bounds, \ |
511 DISABLED_WARNINGS_clang := logical-op-parentheses, \ |
502 DISABLED_WARNINGS_clang := logical-op-parentheses, \ |
512 DISABLED_WARNINGS_microsoft := 4267, \ |
503 DISABLED_WARNINGS_microsoft := 4267, \ |
513 MAPFILE := $(BUILD_LIBJAVAJPEG_MAPFILE), \ |
504 MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjpeg/mapfile-vers, \ |
514 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
505 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
515 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
506 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
516 LIBS := $(LIBJPEG_LIBS) $(JDKLIB_LIBS), \ |
507 LIBS := $(LIBJPEG_LIBS) $(JDKLIB_LIBS), \ |
517 LIBS_windows := $(WIN_JAVA_LIB) jvm.lib, \ |
508 LIBS_windows := $(WIN_JAVA_LIB) jvm.lib, \ |
518 VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ |
509 VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ |
643 |
634 |
644 LIBFONTMANAGER_CFLAGS += $(HARFBUZZ_CFLAGS) |
635 LIBFONTMANAGER_CFLAGS += $(HARFBUZZ_CFLAGS) |
645 |
636 |
646 #### End harfbuzz configuration |
637 #### End harfbuzz configuration |
647 |
638 |
648 ifndef OPENJDK |
639 LIBFONTMANAGER_CFLAGS += $(FREETYPE_CFLAGS) |
649 LIBFONTMANAGER_CFLAGS += -I$(JDK_TOPDIR)/src/closed/java.desktop/share/native/libt2k |
640 # This may be overridden in a custom makefile |
650 BUILD_LIBFONTMANAGER_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libfontmanager/mapfile-vers |
641 BUILD_LIBFONTMANAGER_MAPFILE ?= $(JDK_TOPDIR)/make/mapfiles/libfontmanager/mapfile-vers |
651 LIBFONTMANAGER_EXCLUDE_FILES += freetypeScaler.c |
642 BUILD_LIBFONTMANAGER_FONTLIB += $(FREETYPE_LIBS) |
652 else |
|
653 LIBFONTMANAGER_CFLAGS += $(FREETYPE_CFLAGS) |
|
654 BUILD_LIBFONTMANAGER_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libfontmanager/mapfile-vers.openjdk |
|
655 BUILD_LIBFONTMANAGER_FONTLIB := $(FREETYPE_LIBS) |
|
656 endif |
|
657 |
643 |
658 LIBFONTMANAGER_OPTIMIZATION := HIGH |
644 LIBFONTMANAGER_OPTIMIZATION := HIGH |
659 |
645 |
660 ifeq ($(OPENJDK_TARGET_OS), windows) |
646 ifeq ($(OPENJDK_TARGET_OS), windows) |
661 LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \ |
647 LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \ |