790 endif |
790 endif |
791 LIBSPLASHSCREEN_CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE -DPNG_ARM_NEON_OPT=0 |
791 LIBSPLASHSCREEN_CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE -DPNG_ARM_NEON_OPT=0 |
792 |
792 |
793 ifeq ($(OPENJDK_TARGET_OS), macosx) |
793 ifeq ($(OPENJDK_TARGET_OS), macosx) |
794 LIBSPLASHSCREEN_CFLAGS += -DWITH_MACOSX |
794 LIBSPLASHSCREEN_CFLAGS += -DWITH_MACOSX |
795 # LIBSPLASHSCREEN_HEADER_FLAGS += -I$(TOPDIR)/src/java.desktop/macosx/native/libosxapp |
|
796 |
795 |
797 BUILD_LIBSPLASHSCREEN_java_awt_SplashScreen.c_CFLAGS := -x objective-c -O0 |
796 BUILD_LIBSPLASHSCREEN_java_awt_SplashScreen.c_CFLAGS := -x objective-c -O0 |
798 BUILD_LIBSPLASHSCREEN_splashscreen_gfx_impl.c_CFLAGS := -x objective-c -O0 |
797 BUILD_LIBSPLASHSCREEN_splashscreen_gfx_impl.c_CFLAGS := -x objective-c -O0 |
799 BUILD_LIBSPLASHSCREEN_splashscreen_gif.c_CFLAGS := -x objective-c -O0 |
798 BUILD_LIBSPLASHSCREEN_splashscreen_gif.c_CFLAGS := -x objective-c -O0 |
800 BUILD_LIBSPLASHSCREEN_splashscreen_impl.c_CFLAGS := -x objective-c -O0 |
799 BUILD_LIBSPLASHSCREEN_splashscreen_impl.c_CFLAGS := -x objective-c -O0 |
845 OPTIMIZATION := LOW, \ |
844 OPTIMIZATION := LOW, \ |
846 CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \ |
845 CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \ |
847 $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(PNG_CFLAGS) $(LIBZ_CFLAGS), \ |
846 $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(PNG_CFLAGS) $(LIBZ_CFLAGS), \ |
848 HEADER_FLAGS := \ |
847 HEADER_FLAGS := \ |
849 -I$(call FindHeaderDirForModule, $(MODULE)) \ |
848 -I$(call FindHeaderDirForModule, $(MODULE)) \ |
|
849 $(addprefix -I, $(call FindSrcDirsForLib, java.desktop, osxapp)) \ |
850 $(LIBSPLASHSCREEN_HEADER_FLAGS), \ |
850 $(LIBSPLASHSCREEN_HEADER_FLAGS), \ |
851 DISABLED_WARNINGS_gcc := sign-compare type-limits unused-result \ |
851 DISABLED_WARNINGS_gcc := sign-compare type-limits unused-result \ |
852 maybe-uninitialized shift-negative-value implicit-fallthrough, \ |
852 maybe-uninitialized shift-negative-value implicit-fallthrough, \ |
853 DISABLED_WARNINGS_clang := incompatible-pointer-types, \ |
853 DISABLED_WARNINGS_clang := incompatible-pointer-types, \ |
854 DISABLED_WARNINGS_solstudio := E_NEWLINE_NOT_LAST E_DECLARATION_IN_CODE \ |
854 DISABLED_WARNINGS_solstudio := E_NEWLINE_NOT_LAST E_DECLARATION_IN_CODE \ |
894 EXCLUDE_FILES := $(LIBAWT_LWAWT_EXFILES), \ |
894 EXCLUDE_FILES := $(LIBAWT_LWAWT_EXFILES), \ |
895 EXCLUDES := $(LIBAWT_LWAWT_EXCLUDES), \ |
895 EXCLUDES := $(LIBAWT_LWAWT_EXCLUDES), \ |
896 OPTIMIZATION := LOW, \ |
896 OPTIMIZATION := LOW, \ |
897 CFLAGS := $(CFLAGS_JDKLIB) \ |
897 CFLAGS := $(CFLAGS_JDKLIB) \ |
898 $(LIBAWT_LWAWT_CFLAGS), \ |
898 $(LIBAWT_LWAWT_CFLAGS), \ |
899 HEADER_FLAGS := $(LIBAWT_LWAWT_HEADER_FLAGS), \ |
899 HEADER_FLAGS := \ |
|
900 -I$(call FindHeaderDirForModule, $(MODULE)) \ |
|
901 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt_lwawt/java2d/opengl)) \ |
|
902 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt_lwawt/awt)) \ |
|
903 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt_lwawt/font)) \ |
|
904 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, include)) \ |
|
905 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, common/awt/debug)) \ |
|
906 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, common/java2d/opengl)) \ |
|
907 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt/awt/image)) \ |
|
908 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt/awt/image/cvutils)) \ |
|
909 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt/java2d)) \ |
|
910 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt/java2d/loops)) \ |
|
911 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt/java2d/pipe)) \ |
|
912 $(addprefix -I, $(call FindSrcDirsForLib, java.desktop, osxapp)), \ |
900 DISABLED_WARNINGS_clang := incomplete-implementation enum-conversion \ |
913 DISABLED_WARNINGS_clang := incomplete-implementation enum-conversion \ |
901 deprecated-declarations objc-method-access bitwise-op-parentheses \ |
914 deprecated-declarations objc-method-access bitwise-op-parentheses \ |
902 incompatible-pointer-types parentheses-equality extra-tokens, \ |
915 incompatible-pointer-types parentheses-equality extra-tokens, \ |
903 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
916 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
904 $(call SET_SHARED_LIBRARY_ORIGIN) \ |
917 $(call SET_SHARED_LIBRARY_ORIGIN) \ |
931 |
944 |
932 ################################################################################ |
945 ################################################################################ |
933 |
946 |
934 ifeq ($(OPENJDK_TARGET_OS), macosx) |
947 ifeq ($(OPENJDK_TARGET_OS), macosx) |
935 |
948 |
936 LIBOSXUI_HEADER_FLAGS := \ |
|
937 -I$(TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/awt \ |
|
938 -I$(TOPDIR)/src/java.desktop/macosx/native/libosxapp \ |
|
939 -I$(TOPDIR)/src/java.base/share/native/libjava \ |
|
940 -I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava \ |
|
941 -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \ |
|
942 # |
|
943 |
|
944 $(eval $(call SetupJdkLibrary, BUILD_LIBOSXUI, \ |
949 $(eval $(call SetupJdkLibrary, BUILD_LIBOSXUI, \ |
945 NAME := osxui, \ |
950 NAME := osxui, \ |
946 OPTIMIZATION := LOW, \ |
951 OPTIMIZATION := LOW, \ |
947 CFLAGS := $(CFLAGS_JDKLIB), \ |
952 CFLAGS := $(CFLAGS_JDKLIB), \ |
948 HEADER_FLAGS := $(LIBOSXUI_HEADER_FLAGS), \ |
953 HEADER_FLAGS := \ |
|
954 -I$(call FindHeaderDirForModule, $(MODULE)) \ |
|
955 $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt_lwawt/awt)) \ |
|
956 $(addprefix -I, $(call FindSrcDirsForLib, java.desktop, osxapp)), \ |
949 DISABLED_WARNINGS_clang := deprecated-declarations, \ |
957 DISABLED_WARNINGS_clang := deprecated-declarations, \ |
950 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
958 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
951 $(call SET_SHARED_LIBRARY_ORIGIN) \ |
959 $(call SET_SHARED_LIBRARY_ORIGIN) \ |
952 -Wl$(COMMA)-rpath$(COMMA)@loader_path \ |
960 -Wl$(COMMA)-rpath$(COMMA)@loader_path \ |
953 -L$(INSTALL_LIBRARIES_HERE), \ |
961 -L$(INSTALL_LIBRARIES_HERE), \ |