201 EXCLUDES := $(LIBAWT_EXCLUDES), \ |
201 EXCLUDES := $(LIBAWT_EXCLUDES), \ |
202 EXCLUDE_FILES := $(LIBAWT_EXFILES), \ |
202 EXCLUDE_FILES := $(LIBAWT_EXFILES), \ |
203 OPTIMIZATION := LOW, \ |
203 OPTIMIZATION := LOW, \ |
204 CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_CFLAGS), \ |
204 CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_CFLAGS), \ |
205 HEADER_FLAGS := \ |
205 HEADER_FLAGS := \ |
206 -I$(call FindHeaderDirForModule, $(MODULE)) \ |
|
207 -I$(call FindHeaderDirForModule, java.base) \ |
206 -I$(call FindHeaderDirForModule, java.base) \ |
208 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt/java2d)) \ |
207 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt/java2d)) \ |
209 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt/java2d/d3d)) \ |
208 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt/java2d/d3d)) \ |
210 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt/java2d/loops)) \ |
209 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt/java2d/loops)) \ |
211 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt/java2d/opengl)) \ |
210 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt/java2d/opengl)) \ |
319 |
318 |
320 $(eval $(call SetupJdkLibrary, BUILD_LIBAWT_XAWT, \ |
319 $(eval $(call SetupJdkLibrary, BUILD_LIBAWT_XAWT, \ |
321 NAME := awt_xawt, \ |
320 NAME := awt_xawt, \ |
322 SRC := $(LIBAWT_XAWT_DIRS), \ |
321 SRC := $(LIBAWT_XAWT_DIRS), \ |
323 HEADER_FLAGS := \ |
322 HEADER_FLAGS := \ |
324 -I$(call FindHeaderDirForModule, $(MODULE)) \ |
|
325 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt_xawt/awt)) \ |
323 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt_xawt/awt)) \ |
326 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, include)) \ |
324 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, include)) \ |
327 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, common/java2d/opengl)) \ |
325 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, common/java2d/opengl)) \ |
328 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, common/java2d/x11)) \ |
326 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, common/java2d/x11)) \ |
329 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, common/font)) \ |
327 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, common/font)) \ |
383 CFLAGS := $(LCMS_CFLAGS_JDKLIB) \ |
381 CFLAGS := $(LCMS_CFLAGS_JDKLIB) \ |
384 $(LCMS_CFLAGS), \ |
382 $(LCMS_CFLAGS), \ |
385 CFLAGS_solaris := -xc99=no_lib, \ |
383 CFLAGS_solaris := -xc99=no_lib, \ |
386 CFLAGS_windows := -DCMS_IS_WINDOWS_, \ |
384 CFLAGS_windows := -DCMS_IS_WINDOWS_, \ |
387 HEADER_FLAGS := \ |
385 HEADER_FLAGS := \ |
388 -I$(call FindHeaderDirForModule, $(MODULE)) \ |
|
389 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, common/awt/debug)) \ |
386 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, common/awt/debug)) \ |
390 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt/java2d)), \ |
387 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt/java2d)), \ |
391 HEADERS_FROM_SRC := $(LIBLCMS_HEADERS_FROM_SRC), \ |
388 HEADERS_FROM_SRC := $(LIBLCMS_HEADERS_FROM_SRC), \ |
392 DISABLED_WARNINGS_gcc := format-nonliteral type-limits misleading-indentation, \ |
389 DISABLED_WARNINGS_gcc := format-nonliteral type-limits misleading-indentation, \ |
393 DISABLED_WARNINGS_clang := tautological-compare, \ |
390 DISABLED_WARNINGS_clang := tautological-compare, \ |
430 $(eval $(call SetupJdkLibrary, BUILD_LIBJAVAJPEG, \ |
427 $(eval $(call SetupJdkLibrary, BUILD_LIBJAVAJPEG, \ |
431 NAME := javajpeg, \ |
428 NAME := javajpeg, \ |
432 INCLUDE_FILES := $(BUILD_LIBJAVAJPEG_INCLUDE_FILES), \ |
429 INCLUDE_FILES := $(BUILD_LIBJAVAJPEG_INCLUDE_FILES), \ |
433 OPTIMIZATION := HIGHEST, \ |
430 OPTIMIZATION := HIGHEST, \ |
434 CFLAGS := $(CFLAGS_JDKLIB), \ |
431 CFLAGS := $(CFLAGS_JDKLIB), \ |
435 HEADER_FLAGS := \ |
|
436 -I$(call FindHeaderDirForModule, $(MODULE)), \ |
|
437 HEADERS_FROM_SRC := $(LIBJPEG_HEADERS_FROM_SRC), \ |
432 HEADERS_FROM_SRC := $(LIBJPEG_HEADERS_FROM_SRC), \ |
438 DISABLED_WARNINGS_gcc := clobbered implicit-fallthrough shift-negative-value, \ |
433 DISABLED_WARNINGS_gcc := clobbered implicit-fallthrough shift-negative-value, \ |
439 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
434 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
440 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
435 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
441 LIBS := $(LIBJPEG_LIBS) $(JDKLIB_LIBS), \ |
436 LIBS := $(LIBJPEG_LIBS) $(JDKLIB_LIBS), \ |
468 EXCLUDES := $(LIBAWT_HEADLESS_EXCLUDES), \ |
463 EXCLUDES := $(LIBAWT_HEADLESS_EXCLUDES), \ |
469 OPTIMIZATION := LOW, \ |
464 OPTIMIZATION := LOW, \ |
470 CFLAGS := $(CFLAGS_JDKLIB) \ |
465 CFLAGS := $(CFLAGS_JDKLIB) \ |
471 $(LIBAWT_HEADLESS_CFLAGS), \ |
466 $(LIBAWT_HEADLESS_CFLAGS), \ |
472 HEADER_FLAGS := \ |
467 HEADER_FLAGS := \ |
473 -I$(call FindHeaderDirForModule, $(MODULE)) \ |
|
474 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, common/awt/debug)) \ |
468 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, common/awt/debug)) \ |
475 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, common/font)) \ |
469 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, common/font)) \ |
476 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, common/java2d/opengl)) \ |
470 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, common/java2d/opengl)) \ |
477 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt/java2d)) \ |
471 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt/java2d)) \ |
478 -I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image \ |
472 -I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image \ |
612 CFLAGS := $(CFLAGS_JDKLIB) $(LIBFONTMANAGER_CFLAGS), \ |
606 CFLAGS := $(CFLAGS_JDKLIB) $(LIBFONTMANAGER_CFLAGS), \ |
613 CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBFONTMANAGER_CFLAGS), \ |
607 CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBFONTMANAGER_CFLAGS), \ |
614 OPTIMIZATION := $(LIBFONTMANAGER_OPTIMIZATION), \ |
608 OPTIMIZATION := $(LIBFONTMANAGER_OPTIMIZATION), \ |
615 CFLAGS_windows = -DCC_NOEX, \ |
609 CFLAGS_windows = -DCC_NOEX, \ |
616 HEADER_FLAGS := \ |
610 HEADER_FLAGS := \ |
617 -I$(call FindHeaderDirForModule, $(MODULE)) \ |
|
618 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, common/awt)) \ |
611 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, common/awt)) \ |
619 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, common/font)) \ |
612 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, common/font)) \ |
620 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt/java2d)) \ |
613 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt/java2d)) \ |
621 -I$(TOPDIR)/src/java.desktop/share/native/libfontmanager/harfbuzz \ |
614 -I$(TOPDIR)/src/java.desktop/share/native/libfontmanager/harfbuzz \ |
622 -I$(TOPDIR)/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ucdn \ |
615 -I$(TOPDIR)/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ucdn \ |
682 CFLAGS := $(CXXFLAGS_JDKLIB) \ |
675 CFLAGS := $(CXXFLAGS_JDKLIB) \ |
683 $(LIBJAWT_CFLAGS), \ |
676 $(LIBJAWT_CFLAGS), \ |
684 CXXFLAGS := $(CXXFLAGS_JDKLIB) \ |
677 CXXFLAGS := $(CXXFLAGS_JDKLIB) \ |
685 $(LIBJAWT_CFLAGS), \ |
678 $(LIBJAWT_CFLAGS), \ |
686 HEADER_FLAGS := \ |
679 HEADER_FLAGS := \ |
687 -I$(call FindHeaderDirForModule, $(MODULE)) \ |
|
688 $(addprefix -I, $(call FindSrcDirsForComponent, java.base, include)) \ |
680 $(addprefix -I, $(call FindSrcDirsForComponent, java.base, include)) \ |
689 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, include)) \ |
681 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, include)) \ |
690 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, common/awt/debug)) \ |
682 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, common/awt/debug)) \ |
691 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt/awt/image/cvutils)) \ |
683 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt/awt/image/cvutils)) \ |
692 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt/java2d)) \ |
684 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt/java2d)) \ |
866 CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \ |
858 CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \ |
867 $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(PNG_CFLAGS) $(LIBZ_CFLAGS), \ |
859 $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(PNG_CFLAGS) $(LIBZ_CFLAGS), \ |
868 CXXFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \ |
860 CXXFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \ |
869 $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(PNG_CFLAGS) $(LIBZ_CFLAGS), \ |
861 $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(PNG_CFLAGS) $(LIBZ_CFLAGS), \ |
870 HEADER_FLAGS := \ |
862 HEADER_FLAGS := \ |
871 -I$(call FindHeaderDirForModule, $(MODULE)) \ |
|
872 $(addprefix -I, $(call FindSrcDirsForLib, java.base, java)) \ |
863 $(addprefix -I, $(call FindSrcDirsForLib, java.base, java)) \ |
873 $(addprefix -I, $(call FindSrcDirsForLib, java.desktop, osxapp)) \ |
864 $(addprefix -I, $(call FindSrcDirsForLib, java.desktop, osxapp)) \ |
874 $(addprefix -I, $(call FindSrcDirsForComponent, java.base, include)) \ |
865 $(addprefix -I, $(call FindSrcDirsForComponent, java.base, include)) \ |
875 $(LIBSPLASHSCREEN_HEADER_FLAGS), \ |
866 $(LIBSPLASHSCREEN_HEADER_FLAGS), \ |
876 DISABLED_WARNINGS_gcc := sign-compare type-limits unused-result \ |
867 DISABLED_WARNINGS_gcc := sign-compare type-limits unused-result \ |
920 EXCLUDES := $(LIBAWT_LWAWT_EXCLUDES), \ |
911 EXCLUDES := $(LIBAWT_LWAWT_EXCLUDES), \ |
921 OPTIMIZATION := LOW, \ |
912 OPTIMIZATION := LOW, \ |
922 CFLAGS := $(CFLAGS_JDKLIB) \ |
913 CFLAGS := $(CFLAGS_JDKLIB) \ |
923 $(LIBAWT_LWAWT_CFLAGS), \ |
914 $(LIBAWT_LWAWT_CFLAGS), \ |
924 HEADER_FLAGS := \ |
915 HEADER_FLAGS := \ |
925 -I$(call FindHeaderDirForModule, $(MODULE)) \ |
|
926 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt_lwawt/java2d/opengl)) \ |
916 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt_lwawt/java2d/opengl)) \ |
927 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt_lwawt/awt)) \ |
917 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt_lwawt/awt)) \ |
928 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt_lwawt/font)) \ |
918 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt_lwawt/font)) \ |
929 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, include)) \ |
919 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, include)) \ |
930 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, common/awt/debug)) \ |
920 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, common/awt/debug)) \ |
974 $(eval $(call SetupJdkLibrary, BUILD_LIBOSXUI, \ |
964 $(eval $(call SetupJdkLibrary, BUILD_LIBOSXUI, \ |
975 NAME := osxui, \ |
965 NAME := osxui, \ |
976 OPTIMIZATION := LOW, \ |
966 OPTIMIZATION := LOW, \ |
977 CFLAGS := $(CFLAGS_JDKLIB), \ |
967 CFLAGS := $(CFLAGS_JDKLIB), \ |
978 HEADER_FLAGS := \ |
968 HEADER_FLAGS := \ |
979 -I$(call FindHeaderDirForModule, $(MODULE)) \ |
|
980 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt_lwawt/awt)) \ |
969 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt_lwawt/awt)) \ |
981 $(addprefix -I, $(call FindSrcDirsForLib, java.desktop, osxapp)), \ |
970 $(addprefix -I, $(call FindSrcDirsForLib, java.desktop, osxapp)), \ |
982 DISABLED_WARNINGS_clang := deprecated-declarations, \ |
971 DISABLED_WARNINGS_clang := deprecated-declarations, \ |
983 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
972 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
984 $(call SET_SHARED_LIBRARY_ORIGIN) \ |
973 $(call SET_SHARED_LIBRARY_ORIGIN) \ |