25 |
25 |
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 := \ |
|
31 $(call FindSrcDirsForComponent, $(MODULE), libawt/awt/image) \ |
|
32 $(call FindSrcDirsForComponent, $(MODULE), libawt/awt/image/cvutils) \ |
|
33 $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d) \ |
|
34 $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d/loops) \ |
|
35 $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d/pipe) \ |
|
36 # |
|
37 |
30 ################################################################################ |
38 ################################################################################ |
31 |
39 |
32 # 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 |
33 # for usage by solaris-sparc in libmlib_image_v. |
41 # for usage by solaris-sparc in libmlib_image_v. |
34 BUILD_LIBMLIB_EXCLUDE_SRC_PATTERNS := unix |
42 BUILD_LIBMLIB_EXCLUDE_SRC_PATTERNS := unix |
191 # This option improves performance of MaskFill in Java2D by 20% for some gcc |
199 # This option improves performance of MaskFill in Java2D by 20% for some gcc |
192 LIBAWT_CFLAGS += -fgcse-after-reload |
200 LIBAWT_CFLAGS += -fgcse-after-reload |
193 endif |
201 endif |
194 |
202 |
195 LIBAWT_EXTRA_HEADER_DIRS := \ |
203 LIBAWT_EXTRA_HEADER_DIRS := \ |
|
204 $(LIBAWT_DEFAULT_HEADER_DIRS) \ |
196 $(call FindHeaderDirForModule, java.base) \ |
205 $(call FindHeaderDirForModule, java.base) \ |
197 $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d) \ |
206 $(call FindSrcDirsForComponent, $(MODULE), libawt/awt/medialib) \ |
198 $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d/d3d) \ |
207 $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d/d3d) \ |
199 $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d/loops) \ |
|
200 $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d/opengl) \ |
208 $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d/opengl) \ |
201 $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d/windows) \ |
209 $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d/windows) \ |
202 $(call FindSrcDirsForComponent, $(MODULE), libawt/windows) \ |
210 $(call FindSrcDirsForComponent, $(MODULE), libawt/windows) \ |
203 $(call FindSrcDirsForComponent, $(MODULE), common/awt/medialib) \ |
211 $(call FindSrcDirsForComponent, $(MODULE), common/awt/medialib) \ |
204 $(call FindSrcDirsForComponent, $(MODULE), libmlib_image) \ |
212 $(call FindSrcDirsForComponent, $(MODULE), libmlib_image) \ |
|
213 $(call FindSrcDirsForComponent, $(MODULE), include) \ |
205 $(call FindSrcDirsForComponent, java.base, libjava) \ |
214 $(call FindSrcDirsForComponent, java.base, libjava) \ |
206 $(call FindSrcDirsForComponent, java.base, include) \ |
215 $(call FindSrcDirsForComponent, java.base, include) \ |
207 $(call FindSrcDirsForComponent, $(MODULE), include) \ |
|
208 $(TOPDIR)/src/$(MODULE)/share/native/libawt/awt/image \ |
|
209 $(TOPDIR)/src/$(MODULE)/share/native/libawt/awt/image/cvutils \ |
|
210 $(TOPDIR)/src/$(MODULE)/share/native/libawt/awt/medialib \ |
|
211 $(TOPDIR)/src/$(MODULE)/share/native/libawt/java2d/pipe \ |
|
212 # |
216 # |
213 |
217 |
214 $(eval $(call SetupJdkLibrary, BUILD_LIBAWT, \ |
218 $(eval $(call SetupJdkLibrary, BUILD_LIBAWT, \ |
215 NAME := awt, \ |
219 NAME := awt, \ |
216 EXTRA_SRC := $(LIBAWT_EXTRA_SRC), \ |
220 EXTRA_SRC := $(LIBAWT_EXTRA_SRC), \ |
306 # initializing a declared 'extern' |
310 # initializing a declared 'extern' |
307 BUILD_LIBAWT_XAWT_debug_mem.c_CFLAGS := -w |
311 BUILD_LIBAWT_XAWT_debug_mem.c_CFLAGS := -w |
308 endif |
312 endif |
309 |
313 |
310 LIBAWT_XAWT_EXTRA_HEADER_DIRS := \ |
314 LIBAWT_XAWT_EXTRA_HEADER_DIRS := \ |
|
315 $(LIBAWT_DEFAULT_HEADER_DIRS) \ |
311 $(call FindSrcDirsForComponent, $(MODULE), libawt_xawt/awt) \ |
316 $(call FindSrcDirsForComponent, $(MODULE), libawt_xawt/awt) \ |
312 $(call FindSrcDirsForComponent, $(MODULE), include) \ |
317 $(call FindSrcDirsForComponent, $(MODULE), include) \ |
|
318 $(call FindSrcDirsForComponent, $(MODULE), common/awt/debug) \ |
313 $(call FindSrcDirsForComponent, $(MODULE), common/awt/systemscale) \ |
319 $(call FindSrcDirsForComponent, $(MODULE), common/awt/systemscale) \ |
314 $(call FindSrcDirsForComponent, $(MODULE), common/font) \ |
320 $(call FindSrcDirsForComponent, $(MODULE), common/font) \ |
315 $(call FindSrcDirsForComponent, $(MODULE), common/java2d/opengl) \ |
321 $(call FindSrcDirsForComponent, $(MODULE), common/java2d/opengl) \ |
316 $(call FindSrcDirsForComponent, $(MODULE), common/java2d/x11) \ |
322 $(call FindSrcDirsForComponent, $(MODULE), common/java2d/x11) \ |
317 $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d) \ |
323 # |
318 $(TOPDIR)/src/$(MODULE)/share/native/libawt/awt/image \ |
|
319 $(TOPDIR)/src/$(MODULE)/share/native/libawt/awt/image/cvutils \ |
|
320 $(TOPDIR)/src/$(MODULE)/share/native/libawt/java2d/loops \ |
|
321 $(TOPDIR)/src/$(MODULE)/share/native/libawt/java2d/pipe \ |
|
322 $(TOPDIR)/src/$(MODULE)/share/native/common/awt/debug \ |
|
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), \ |
328 EXTRA_HEADER_DIRS := $(LIBAWT_XAWT_EXTRA_HEADER_DIRS), \ |
328 EXTRA_HEADER_DIRS := $(LIBAWT_XAWT_EXTRA_HEADER_DIRS), \ |
451 LIBAWT_HEADLESS_EXCLUDES := medialib |
451 LIBAWT_HEADLESS_EXCLUDES := medialib |
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 $(call FindSrcDirsForComponent, $(MODULE), common/awt/debug) \ |
457 $(call FindSrcDirsForComponent, $(MODULE), common/awt/debug) \ |
457 $(call FindSrcDirsForComponent, $(MODULE), common/font) \ |
458 $(call FindSrcDirsForComponent, $(MODULE), common/font) \ |
458 $(call FindSrcDirsForComponent, $(MODULE), common/java2d/opengl) \ |
459 $(call FindSrcDirsForComponent, $(MODULE), common/java2d/opengl) \ |
459 $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d) \ |
|
460 $(TOPDIR)/src/$(MODULE)/share/native/libawt/awt/image \ |
|
461 $(TOPDIR)/src/$(MODULE)/share/native/libawt/awt/image/cvutils \ |
|
462 $(TOPDIR)/src/$(MODULE)/share/native/libawt/java2d/loops \ |
|
463 $(TOPDIR)/src/$(MODULE)/share/native/libawt/java2d/pipe \ |
|
464 # |
460 # |
465 |
461 |
466 $(eval $(call SetupJdkLibrary, BUILD_LIBAWT_HEADLESS, \ |
462 $(eval $(call SetupJdkLibrary, BUILD_LIBAWT_HEADLESS, \ |
467 NAME := awt_headless, \ |
463 NAME := awt_headless, \ |
468 EXTRA_SRC := $(LIBAWT_HEADLESS_EXTRA_SRC), \ |
464 EXTRA_SRC := $(LIBAWT_HEADLESS_EXTRA_SRC), \ |
583 # Turn off aliasing with GCC for ExtensionSubtables.cpp |
579 # Turn off aliasing with GCC for ExtensionSubtables.cpp |
584 BUILD_LIBFONTMANAGER_ExtensionSubtables.cpp_CXXFLAGS := -fno-strict-aliasing |
580 BUILD_LIBFONTMANAGER_ExtensionSubtables.cpp_CXXFLAGS := -fno-strict-aliasing |
585 endif |
581 endif |
586 |
582 |
587 LIBFONTMANAGER_EXTRA_HEADER_DIRS := \ |
583 LIBFONTMANAGER_EXTRA_HEADER_DIRS := \ |
|
584 $(call FindSrcDirsForComponent, $(MODULE), libfontmanager/harfbuzz) \ |
|
585 $(call FindSrcDirsForComponent, $(MODULE), libfontmanager/harfbuzz/hb-ucdn) \ |
588 $(call FindSrcDirsForComponent, $(MODULE), common/awt) \ |
586 $(call FindSrcDirsForComponent, $(MODULE), common/awt) \ |
589 $(call FindSrcDirsForComponent, $(MODULE), common/font) \ |
587 $(call FindSrcDirsForComponent, $(MODULE), common/font) \ |
590 $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d) \ |
588 $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d) \ |
591 $(TOPDIR)/src/$(MODULE)/share/native/libfontmanager/harfbuzz \ |
589 $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d/pipe) \ |
592 $(TOPDIR)/src/$(MODULE)/share/native/libfontmanager/harfbuzz/hb-ucdn \ |
590 $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d/loops) \ |
593 $(TOPDIR)/src/$(MODULE)/share/native/libawt/java2d/loops \ |
|
594 $(TOPDIR)/src/$(MODULE)/share/native/libawt/java2d/pipe \ |
|
595 # |
591 # |
596 |
592 |
597 # |
593 # |
598 # LDFLAGS clarification: |
594 # LDFLAGS clarification: |
599 # Filter relevant linker flags disallowing unresolved symbols as we cannot |
595 # Filter relevant linker flags disallowing unresolved symbols as we cannot |
662 ifeq ($(OPENJDK_TARGET_CPU), x86) |
658 ifeq ($(OPENJDK_TARGET_CPU), x86) |
663 KERNEL32_LIB := kernel32.lib |
659 KERNEL32_LIB := kernel32.lib |
664 endif |
660 endif |
665 |
661 |
666 LIBJAWT_EXTRA_HEADER_DIRS := \ |
662 LIBJAWT_EXTRA_HEADER_DIRS := \ |
667 $(call FindSrcDirsForComponent, java.base, include) \ |
|
668 $(call FindSrcDirsForComponent, $(MODULE), include) \ |
663 $(call FindSrcDirsForComponent, $(MODULE), include) \ |
669 $(call FindSrcDirsForComponent, $(MODULE), common/awt/debug) \ |
664 $(call FindSrcDirsForComponent, $(MODULE), common/awt/debug) \ |
670 $(call FindSrcDirsForComponent, $(MODULE), libawt/awt/image/cvutils) \ |
665 $(call FindSrcDirsForComponent, $(MODULE), libawt/awt/image/cvutils) \ |
671 $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d) \ |
666 $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d) \ |
672 $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d/windows) \ |
667 $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d/windows) \ |
673 $(call FindSrcDirsForComponent, $(MODULE), libawt/windows) \ |
668 $(call FindSrcDirsForComponent, $(MODULE), libawt/windows) \ |
|
669 $(call FindSrcDirsForComponent, java.base, include) \ |
674 $(call FindSrcDirsForComponent, java.base, libjava) \ |
670 $(call FindSrcDirsForComponent, java.base, libjava) \ |
675 # |
671 # |
676 |
672 |
677 $(eval $(call SetupJdkLibrary, BUILD_LIBJAWT, \ |
673 $(eval $(call SetupJdkLibrary, BUILD_LIBJAWT, \ |
678 NAME := jawt, \ |
674 NAME := jawt, \ |
843 else |
839 else |
844 LIBSPLASHSCREEN_LIBS += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread -ldl |
840 LIBSPLASHSCREEN_LIBS += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread -ldl |
845 endif |
841 endif |
846 |
842 |
847 LIBSPLASHSCREEN_HEADER_DIRS += \ |
843 LIBSPLASHSCREEN_HEADER_DIRS += \ |
848 $(call FindSrcDirsForComponent, java.base, libjava) \ |
|
849 $(call FindSrcDirsForComponent, $(MODULE), libosxapp) \ |
844 $(call FindSrcDirsForComponent, $(MODULE), libosxapp) \ |
850 $(call FindSrcDirsForComponent, java.base, include) \ |
845 $(call FindSrcDirsForComponent, java.base, include) \ |
|
846 $(call FindSrcDirsForComponent, java.base, libjava) \ |
851 # |
847 # |
852 |
848 |
853 $(eval $(call SetupJdkLibrary, BUILD_LIBSPLASHSCREEN, \ |
849 $(eval $(call SetupJdkLibrary, BUILD_LIBSPLASHSCREEN, \ |
854 NAME := splashscreen, \ |
850 NAME := splashscreen, \ |
855 SRC := $(LIBSPLASHSCREEN_DIRS), \ |
851 SRC := $(LIBSPLASHSCREEN_DIRS), \ |
898 |
894 |
899 LIBAWT_LWAWT_EXFILES := fontpath.c awt_Font.c X11Color.c |
895 LIBAWT_LWAWT_EXFILES := fontpath.c awt_Font.c X11Color.c |
900 LIBAWT_LWAWT_EXCLUDES := $(TOPDIR)/src/$(MODULE)/unix/native/common/awt/medialib |
896 LIBAWT_LWAWT_EXCLUDES := $(TOPDIR)/src/$(MODULE)/unix/native/common/awt/medialib |
901 |
897 |
902 LIBAWT_LWAWT_EXTRA_HEADER_DIRS := \ |
898 LIBAWT_LWAWT_EXTRA_HEADER_DIRS := \ |
903 $(call FindSrcDirsForComponent, $(MODULE), libawt_lwawt/java2d/opengl) \ |
899 $(LIBAWT_DEFAULT_HEADER_DIRS) \ |
904 $(call FindSrcDirsForComponent, $(MODULE), libawt_lwawt/awt) \ |
900 $(call FindSrcDirsForComponent, $(MODULE), libawt_lwawt/awt) \ |
905 $(call FindSrcDirsForComponent, $(MODULE), libawt_lwawt/font) \ |
901 $(call FindSrcDirsForComponent, $(MODULE), libawt_lwawt/font) \ |
|
902 $(call FindSrcDirsForComponent, $(MODULE), libawt_lwawt/java2d/opengl) \ |
906 $(call FindSrcDirsForComponent, $(MODULE), include) \ |
903 $(call FindSrcDirsForComponent, $(MODULE), include) \ |
907 $(call FindSrcDirsForComponent, $(MODULE), common/awt/debug) \ |
904 $(call FindSrcDirsForComponent, $(MODULE), common/awt/debug) \ |
908 $(call FindSrcDirsForComponent, $(MODULE), common/java2d/opengl) \ |
905 $(call FindSrcDirsForComponent, $(MODULE), common/java2d/opengl) \ |
909 $(call FindSrcDirsForComponent, $(MODULE), libawt/awt/image) \ |
|
910 $(call FindSrcDirsForComponent, $(MODULE), libawt/awt/image/cvutils) \ |
|
911 $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d) \ |
|
912 $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d/loops) \ |
|
913 $(call FindSrcDirsForComponent, $(MODULE), libawt/java2d/pipe) \ |
|
914 $(call FindSrcDirsForComponent, $(MODULE), libosxapp) \ |
906 $(call FindSrcDirsForComponent, $(MODULE), libosxapp) \ |
915 # |
907 # |
916 |
908 |
917 $(eval $(call SetupJdkLibrary, BUILD_LIBAWT_LWAWT, \ |
909 $(eval $(call SetupJdkLibrary, BUILD_LIBAWT_LWAWT, \ |
918 NAME := awt_lwawt, \ |
910 NAME := awt_lwawt, \ |
919 EXTRA_SRC := $(LIBAWT_LWAWT_EXTRA_SRC), \ |
911 EXTRA_SRC := $(LIBAWT_LWAWT_EXTRA_SRC), \ |
920 INCLUDE_FILES := $(LIBAWT_LWAWT_FILES), \ |
912 INCLUDE_FILES := $(LIBAWT_LWAWT_FILES), \ |