26 $(eval $(call IncludeCustomExtension, lib/Awt2dLibraries-pre.gmk)) |
26 $(eval $(call IncludeCustomExtension, lib/Awt2dLibraries-pre.gmk)) |
27 |
27 |
28 WIN_AWT_LIB := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libawt/awt.lib |
28 WIN_AWT_LIB := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libawt/awt.lib |
29 |
29 |
30 LIBAWT_DEFAULT_HEADER_DIRS := \ |
30 LIBAWT_DEFAULT_HEADER_DIRS := \ |
31 $(call FindSrcDirsForComponent, $(MODULE), libawt/awt/image) \ |
31 libawt/awt/image \ |
32 $(call FindSrcDirsForComponent, $(MODULE), libawt/awt/image/cvutils) \ |
32 libawt/awt/image/cvutils \ |
33 $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d) \ |
33 libawt/java2d \ |
34 $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d/loops) \ |
34 libawt/java2d/loops \ |
35 $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d/pipe) \ |
35 libawt/java2d/pipe \ |
36 # |
36 # |
37 |
37 |
38 ################################################################################ |
38 ################################################################################ |
39 |
39 |
40 # We must not include java.desktop/unix/native/libmlib_image, which is only |
40 # We must not include java.desktop/unix/native/libmlib_image, which is only |
201 endif |
201 endif |
202 |
202 |
203 LIBAWT_EXTRA_HEADER_DIRS := \ |
203 LIBAWT_EXTRA_HEADER_DIRS := \ |
204 $(LIBAWT_DEFAULT_HEADER_DIRS) \ |
204 $(LIBAWT_DEFAULT_HEADER_DIRS) \ |
205 $(call FindHeaderDirForModule, java.base) \ |
205 $(call FindHeaderDirForModule, java.base) \ |
206 $(call FindSrcDirsForComponent, $(MODULE), libawt/awt/medialib) \ |
206 libawt/awt/medialib \ |
207 $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d/d3d) \ |
207 libawt/java2d/d3d \ |
208 $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d/opengl) \ |
208 libawt/java2d/opengl \ |
209 $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d/windows) \ |
209 libawt/java2d/windows \ |
210 $(call FindSrcDirsForComponent, $(MODULE), libawt/windows) \ |
210 libawt/windows \ |
211 $(call FindSrcDirsForComponent, $(MODULE), common/awt/medialib) \ |
211 common/awt/medialib \ |
212 $(call FindSrcDirsForComponent, $(MODULE), libmlib_image) \ |
212 libmlib_image \ |
213 $(call FindSrcDirsForComponent, $(MODULE), include) \ |
213 include \ |
214 $(call FindSrcDirsForComponent, java.base, libjava) \ |
214 java.base:libjava \ |
215 $(call FindSrcDirsForComponent, java.base, include) \ |
215 java.base:include \ |
216 # |
216 # |
217 |
217 |
218 $(eval $(call SetupJdkLibrary, BUILD_LIBAWT, \ |
218 $(eval $(call SetupJdkLibrary, BUILD_LIBAWT, \ |
219 NAME := awt, \ |
219 NAME := awt, \ |
220 EXTRA_SRC := $(LIBAWT_EXTRA_SRC), \ |
220 EXTRA_SRC := $(LIBAWT_EXTRA_SRC), \ |
311 BUILD_LIBAWT_XAWT_debug_mem.c_CFLAGS := -w |
311 BUILD_LIBAWT_XAWT_debug_mem.c_CFLAGS := -w |
312 endif |
312 endif |
313 |
313 |
314 LIBAWT_XAWT_EXTRA_HEADER_DIRS := \ |
314 LIBAWT_XAWT_EXTRA_HEADER_DIRS := \ |
315 $(LIBAWT_DEFAULT_HEADER_DIRS) \ |
315 $(LIBAWT_DEFAULT_HEADER_DIRS) \ |
316 $(call FindSrcDirsForComponent, $(MODULE), libawt_xawt/awt) \ |
316 libawt_xawt/awt \ |
317 $(call FindSrcDirsForComponent, $(MODULE), include) \ |
317 include \ |
318 $(call FindSrcDirsForComponent, $(MODULE), common/awt/debug) \ |
318 common/awt/debug \ |
319 $(call FindSrcDirsForComponent, $(MODULE), common/awt/systemscale) \ |
319 common/awt/systemscale \ |
320 $(call FindSrcDirsForComponent, $(MODULE), common/font) \ |
320 common/font \ |
321 $(call FindSrcDirsForComponent, $(MODULE), common/java2d/opengl) \ |
321 common/java2d/opengl \ |
322 $(call FindSrcDirsForComponent, $(MODULE), common/java2d/x11) \ |
322 common/java2d/x11 \ |
323 # |
323 # |
324 |
324 |
325 $(eval $(call SetupJdkLibrary, BUILD_LIBAWT_XAWT, \ |
325 $(eval $(call SetupJdkLibrary, BUILD_LIBAWT_XAWT, \ |
326 NAME := awt_xawt, \ |
326 NAME := awt_xawt, \ |
327 EXTRA_SRC := $(LIBAWT_XAWT_EXTRA_SRC), \ |
327 EXTRA_SRC := $(LIBAWT_XAWT_EXTRA_SRC), \ |
377 CFLAGS := $(LCMS_CFLAGS_JDKLIB) \ |
377 CFLAGS := $(LCMS_CFLAGS_JDKLIB) \ |
378 $(LCMS_CFLAGS), \ |
378 $(LCMS_CFLAGS), \ |
379 CFLAGS_solaris := -xc99=no_lib, \ |
379 CFLAGS_solaris := -xc99=no_lib, \ |
380 CFLAGS_windows := -DCMS_IS_WINDOWS_, \ |
380 CFLAGS_windows := -DCMS_IS_WINDOWS_, \ |
381 EXTRA_HEADER_DIRS := \ |
381 EXTRA_HEADER_DIRS := \ |
382 $(call FindSrcDirsForComponent, $(MODULE), common/awt/debug) \ |
382 common/awt/debug \ |
383 $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d), \ |
383 libawt/java2d, \ |
384 HEADERS_FROM_SRC := $(LIBLCMS_HEADERS_FROM_SRC), \ |
384 HEADERS_FROM_SRC := $(LIBLCMS_HEADERS_FROM_SRC), \ |
385 DISABLED_WARNINGS_gcc := format-nonliteral type-limits misleading-indentation, \ |
385 DISABLED_WARNINGS_gcc := format-nonliteral type-limits misleading-indentation, \ |
386 DISABLED_WARNINGS_clang := tautological-compare, \ |
386 DISABLED_WARNINGS_clang := tautological-compare, \ |
387 DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \ |
387 DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \ |
388 DISABLED_WARNINGS_microsoft := 4819, \ |
388 DISABLED_WARNINGS_microsoft := 4819, \ |
452 LIBAWT_HEADLESS_CFLAGS := $(CUPS_CFLAGS) $(FONTCONFIG_CFLAGS) $(X_CFLAGS) \ |
452 LIBAWT_HEADLESS_CFLAGS := $(CUPS_CFLAGS) $(FONTCONFIG_CFLAGS) $(X_CFLAGS) \ |
453 -DHEADLESS=true -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" |
453 -DHEADLESS=true -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" |
454 |
454 |
455 LIBAWT_HEADLESS_EXTRA_HEADER_DIRS := \ |
455 LIBAWT_HEADLESS_EXTRA_HEADER_DIRS := \ |
456 $(LIBAWT_DEFAULT_HEADER_DIRS) \ |
456 $(LIBAWT_DEFAULT_HEADER_DIRS) \ |
457 $(call FindSrcDirsForComponent, $(MODULE), common/awt/debug) \ |
457 common/awt/debug \ |
458 $(call FindSrcDirsForComponent, $(MODULE), common/font) \ |
458 common/font \ |
459 $(call FindSrcDirsForComponent, $(MODULE), common/java2d/opengl) \ |
459 common/java2d/opengl \ |
460 # |
460 # |
461 |
461 |
462 $(eval $(call SetupJdkLibrary, BUILD_LIBAWT_HEADLESS, \ |
462 $(eval $(call SetupJdkLibrary, BUILD_LIBAWT_HEADLESS, \ |
463 NAME := awt_headless, \ |
463 NAME := awt_headless, \ |
464 EXTRA_SRC := $(LIBAWT_HEADLESS_EXTRA_SRC), \ |
464 EXTRA_SRC := $(LIBAWT_HEADLESS_EXTRA_SRC), \ |
579 # Turn off aliasing with GCC for ExtensionSubtables.cpp |
579 # Turn off aliasing with GCC for ExtensionSubtables.cpp |
580 BUILD_LIBFONTMANAGER_ExtensionSubtables.cpp_CXXFLAGS := -fno-strict-aliasing |
580 BUILD_LIBFONTMANAGER_ExtensionSubtables.cpp_CXXFLAGS := -fno-strict-aliasing |
581 endif |
581 endif |
582 |
582 |
583 LIBFONTMANAGER_EXTRA_HEADER_DIRS := \ |
583 LIBFONTMANAGER_EXTRA_HEADER_DIRS := \ |
584 $(call FindSrcDirsForComponent, $(MODULE), libfontmanager/harfbuzz) \ |
584 libfontmanager/harfbuzz \ |
585 $(call FindSrcDirsForComponent, $(MODULE), libfontmanager/harfbuzz/hb-ucdn) \ |
585 libfontmanager/harfbuzz/hb-ucdn \ |
586 $(call FindSrcDirsForComponent, $(MODULE), common/awt) \ |
586 common/awt \ |
587 $(call FindSrcDirsForComponent, $(MODULE), common/font) \ |
587 common/font \ |
588 $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d) \ |
588 libawt/java2d \ |
589 $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d/pipe) \ |
589 libawt/java2d/pipe \ |
590 $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d/loops) \ |
590 libawt/java2d/loops \ |
591 # |
591 # |
592 |
592 |
593 # |
593 # |
594 # LDFLAGS clarification: |
594 # LDFLAGS clarification: |
595 # Filter relevant linker flags disallowing unresolved symbols as we cannot |
595 # Filter relevant linker flags disallowing unresolved symbols as we cannot |
658 ifeq ($(OPENJDK_TARGET_CPU), x86) |
658 ifeq ($(OPENJDK_TARGET_CPU), x86) |
659 KERNEL32_LIB := kernel32.lib |
659 KERNEL32_LIB := kernel32.lib |
660 endif |
660 endif |
661 |
661 |
662 LIBJAWT_EXTRA_HEADER_DIRS := \ |
662 LIBJAWT_EXTRA_HEADER_DIRS := \ |
663 $(call FindSrcDirsForComponent, $(MODULE), include) \ |
663 include \ |
664 $(call FindSrcDirsForComponent, $(MODULE), common/awt/debug) \ |
664 common/awt/debug \ |
665 $(call FindSrcDirsForComponent, $(MODULE), libawt/awt/image/cvutils) \ |
665 libawt/awt/image/cvutils \ |
666 $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d) \ |
666 libawt/java2d \ |
667 $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d/windows) \ |
667 libawt/java2d/windows \ |
668 $(call FindSrcDirsForComponent, $(MODULE), libawt/windows) \ |
668 libawt/windows \ |
669 $(call FindSrcDirsForComponent, java.base, include) \ |
669 java.base:include \ |
670 $(call FindSrcDirsForComponent, java.base, libjava) \ |
670 java.base:libjava \ |
671 # |
671 # |
672 |
672 |
673 $(eval $(call SetupJdkLibrary, BUILD_LIBJAWT, \ |
673 $(eval $(call SetupJdkLibrary, BUILD_LIBJAWT, \ |
674 NAME := jawt, \ |
674 NAME := jawt, \ |
675 OPTIMIZATION := LOW, \ |
675 OPTIMIZATION := LOW, \ |
723 INCLUDE_FILES := $(JAWT_FILES), \ |
723 INCLUDE_FILES := $(JAWT_FILES), \ |
724 OPTIMIZATION := LOW, \ |
724 OPTIMIZATION := LOW, \ |
725 CFLAGS := $(CFLAGS_JDKLIB) \ |
725 CFLAGS := $(CFLAGS_JDKLIB) \ |
726 $(JAWT_CFLAGS), \ |
726 $(JAWT_CFLAGS), \ |
727 EXTRA_HEADER_DIRS := \ |
727 EXTRA_HEADER_DIRS := \ |
728 $(call FindSrcDirsForComponent, $(MODULE), include) \ |
728 include \ |
729 $(call FindSrcDirsForComponent, $(MODULE), common/awt), \ |
729 common/awt, \ |
730 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
730 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
731 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
731 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
732 LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \ |
732 LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \ |
733 LDFLAGS_macosx := -Wl$(COMMA)-rpath$(COMMA)@loader_path, \ |
733 LDFLAGS_macosx := -Wl$(COMMA)-rpath$(COMMA)@loader_path, \ |
734 LIBS_unix := $(JAWT_LIBS) $(JDKLIB_LIBS), \ |
734 LIBS_unix := $(JAWT_LIBS) $(JDKLIB_LIBS), \ |
839 else |
839 else |
840 LIBSPLASHSCREEN_LIBS += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread -ldl |
840 LIBSPLASHSCREEN_LIBS += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread -ldl |
841 endif |
841 endif |
842 |
842 |
843 LIBSPLASHSCREEN_HEADER_DIRS += \ |
843 LIBSPLASHSCREEN_HEADER_DIRS += \ |
844 $(call FindSrcDirsForComponent, $(MODULE), libosxapp) \ |
844 libosxapp \ |
845 $(call FindSrcDirsForComponent, java.base, include) \ |
845 java.base:include \ |
846 $(call FindSrcDirsForComponent, java.base, libjava) \ |
846 java.base:libjava \ |
847 # |
847 # |
848 |
848 |
849 $(eval $(call SetupJdkLibrary, BUILD_LIBSPLASHSCREEN, \ |
849 $(eval $(call SetupJdkLibrary, BUILD_LIBSPLASHSCREEN, \ |
850 NAME := splashscreen, \ |
850 NAME := splashscreen, \ |
851 SRC := $(LIBSPLASHSCREEN_DIRS), \ |
851 SRC := $(LIBSPLASHSCREEN_DIRS), \ |
895 LIBAWT_LWAWT_EXFILES := fontpath.c awt_Font.c X11Color.c |
895 LIBAWT_LWAWT_EXFILES := fontpath.c awt_Font.c X11Color.c |
896 LIBAWT_LWAWT_EXCLUDES := $(TOPDIR)/src/$(MODULE)/unix/native/common/awt/medialib |
896 LIBAWT_LWAWT_EXCLUDES := $(TOPDIR)/src/$(MODULE)/unix/native/common/awt/medialib |
897 |
897 |
898 LIBAWT_LWAWT_EXTRA_HEADER_DIRS := \ |
898 LIBAWT_LWAWT_EXTRA_HEADER_DIRS := \ |
899 $(LIBAWT_DEFAULT_HEADER_DIRS) \ |
899 $(LIBAWT_DEFAULT_HEADER_DIRS) \ |
900 $(call FindSrcDirsForComponent, $(MODULE), libawt_lwawt/awt) \ |
900 libawt_lwawt/awt \ |
901 $(call FindSrcDirsForComponent, $(MODULE), libawt_lwawt/font) \ |
901 libawt_lwawt/font \ |
902 $(call FindSrcDirsForComponent, $(MODULE), libawt_lwawt/java2d/opengl) \ |
902 libawt_lwawt/java2d/opengl \ |
903 $(call FindSrcDirsForComponent, $(MODULE), include) \ |
903 include \ |
904 $(call FindSrcDirsForComponent, $(MODULE), common/awt/debug) \ |
904 common/awt/debug \ |
905 $(call FindSrcDirsForComponent, $(MODULE), common/java2d/opengl) \ |
905 common/java2d/opengl \ |
906 $(call FindSrcDirsForComponent, $(MODULE), libosxapp) \ |
906 libosxapp \ |
907 # |
907 # |
908 |
908 |
909 $(eval $(call SetupJdkLibrary, BUILD_LIBAWT_LWAWT, \ |
909 $(eval $(call SetupJdkLibrary, BUILD_LIBAWT_LWAWT, \ |
910 NAME := awt_lwawt, \ |
910 NAME := awt_lwawt, \ |
911 EXTRA_SRC := $(LIBAWT_LWAWT_EXTRA_SRC), \ |
911 EXTRA_SRC := $(LIBAWT_LWAWT_EXTRA_SRC), \ |
955 $(eval $(call SetupJdkLibrary, BUILD_LIBOSXUI, \ |
955 $(eval $(call SetupJdkLibrary, BUILD_LIBOSXUI, \ |
956 NAME := osxui, \ |
956 NAME := osxui, \ |
957 OPTIMIZATION := LOW, \ |
957 OPTIMIZATION := LOW, \ |
958 CFLAGS := $(CFLAGS_JDKLIB), \ |
958 CFLAGS := $(CFLAGS_JDKLIB), \ |
959 EXTRA_HEADER_DIRS := \ |
959 EXTRA_HEADER_DIRS := \ |
960 $(call FindSrcDirsForComponent, $(MODULE), libawt_lwawt/awt) \ |
960 libawt_lwawt/awt \ |
961 $(call FindSrcDirsForComponent, $(MODULE), libosxapp), \ |
961 libosxapp, \ |
962 DISABLED_WARNINGS_clang := deprecated-declarations, \ |
962 DISABLED_WARNINGS_clang := deprecated-declarations, \ |
963 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
963 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
964 $(call SET_SHARED_LIBRARY_ORIGIN) \ |
964 $(call SET_SHARED_LIBRARY_ORIGIN) \ |
965 -Wl$(COMMA)-rpath$(COMMA)@loader_path \ |
965 -Wl$(COMMA)-rpath$(COMMA)@loader_path \ |
966 -L$(INSTALL_LIBRARIES_HERE), \ |
966 -L$(INSTALL_LIBRARIES_HERE), \ |