equal
deleted
inserted
replaced
244 LIBS_solaris := $(LIBDL), \ |
244 LIBS_solaris := $(LIBDL), \ |
245 LIBS_aix := $(LIBDL),\ |
245 LIBS_aix := $(LIBDL),\ |
246 LIBS_macosx := -lmlib_image \ |
246 LIBS_macosx := -lmlib_image \ |
247 -framework Cocoa \ |
247 -framework Cocoa \ |
248 -framework OpenGL \ |
248 -framework OpenGL \ |
|
249 -framework Metal \ |
249 -framework JavaNativeFoundation \ |
250 -framework JavaNativeFoundation \ |
250 -framework JavaRuntimeSupport \ |
251 -framework JavaRuntimeSupport \ |
251 -framework ApplicationServices \ |
252 -framework ApplicationServices \ |
252 -framework AudioToolbox, \ |
253 -framework AudioToolbox, \ |
253 LIBS_windows := kernel32.lib user32.lib gdi32.lib winspool.lib \ |
254 LIBS_windows := kernel32.lib user32.lib gdi32.lib winspool.lib \ |
823 $(LIBM) -lpthread -liconv -losxapp \ |
824 $(LIBM) -lpthread -liconv -losxapp \ |
824 -framework ApplicationServices \ |
825 -framework ApplicationServices \ |
825 -framework Foundation \ |
826 -framework Foundation \ |
826 -framework Security \ |
827 -framework Security \ |
827 -framework Cocoa \ |
828 -framework Cocoa \ |
|
829 -framework Metal \ |
828 -framework JavaNativeFoundation |
830 -framework JavaNativeFoundation |
829 else ifeq ($(call isTargetOs, windows), true) |
831 else ifeq ($(call isTargetOs, windows), true) |
830 LIBSPLASHSCREEN_LIBS += kernel32.lib user32.lib gdi32.lib delayimp.lib $(WIN_JAVA_LIB) jvm.lib |
832 LIBSPLASHSCREEN_LIBS += kernel32.lib user32.lib gdi32.lib delayimp.lib $(WIN_JAVA_LIB) jvm.lib |
831 else |
833 else |
832 LIBSPLASHSCREEN_LIBS += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread -ldl |
834 LIBSPLASHSCREEN_LIBS += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread -ldl |
885 LIBAWT_LWAWT_EXTRA_HEADER_DIRS := \ |
887 LIBAWT_LWAWT_EXTRA_HEADER_DIRS := \ |
886 $(LIBAWT_DEFAULT_HEADER_DIRS) \ |
888 $(LIBAWT_DEFAULT_HEADER_DIRS) \ |
887 libawt_lwawt/awt \ |
889 libawt_lwawt/awt \ |
888 libawt_lwawt/font \ |
890 libawt_lwawt/font \ |
889 libawt_lwawt/java2d/opengl \ |
891 libawt_lwawt/java2d/opengl \ |
|
892 libawt_lwawt/java2d/metal \ |
890 include \ |
893 include \ |
891 common/awt/debug \ |
894 common/awt/debug \ |
892 common/java2d/opengl \ |
895 common/java2d/opengl \ |
893 libosxapp \ |
896 libosxapp \ |
894 # |
897 # |
920 -framework Accelerate \ |
923 -framework Accelerate \ |
921 -framework ApplicationServices \ |
924 -framework ApplicationServices \ |
922 -framework AudioToolbox \ |
925 -framework AudioToolbox \ |
923 -framework Carbon \ |
926 -framework Carbon \ |
924 -framework Cocoa \ |
927 -framework Cocoa \ |
|
928 -framework Metal \ |
925 -framework Security \ |
929 -framework Security \ |
926 -framework ExceptionHandling \ |
930 -framework ExceptionHandling \ |
927 -framework JavaNativeFoundation \ |
931 -framework JavaNativeFoundation \ |
928 -framework JavaRuntimeSupport \ |
932 -framework JavaRuntimeSupport \ |
929 -framework OpenGL \ |
933 -framework OpenGL \ |
930 -framework Metal \ |
|
931 -framework QuartzCore -ljava, \ |
934 -framework QuartzCore -ljava, \ |
932 )) |
935 )) |
933 |
936 |
934 TARGETS += $(BUILD_LIBAWT_LWAWT) |
937 TARGETS += $(BUILD_LIBAWT_LWAWT) |
935 |
938 |
944 endif |
947 endif |
945 |
948 |
946 ################################################################################ |
949 ################################################################################ |
947 |
950 |
948 ifeq ($(call isTargetOs, macosx), true) |
951 ifeq ($(call isTargetOs, macosx), true) |
|
952 XCODE_PATH := $(shell /usr/bin/xcode-select -p) |
|
953 CompileMetalShaders : |
|
954 $(XCODE_PATH)/Platforms/MacOSX.platform/usr/bin/metal -O2 -std=osx-metal1.1 -o $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libosxui/shaders.air $(TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/awt/shaders.metal |
|
955 $(XCODE_PATH)/Platforms/MacOSX.platform/usr/bin/metal-ar r $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libosxui/shaders.metal-ar $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libosxui/shaders.air |
|
956 $(XCODE_PATH)/Platforms/MacOSX.platform/usr/bin/metallib -o $(INSTALL_LIBRARIES_HERE)/shaders.metallib $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libosxui/shaders.metal-ar |
949 |
957 |
950 $(eval $(call SetupJdkLibrary, BUILD_LIBOSXUI, \ |
958 $(eval $(call SetupJdkLibrary, BUILD_LIBOSXUI, \ |
951 NAME := osxui, \ |
959 NAME := osxui, \ |
952 OPTIMIZATION := LOW, \ |
960 OPTIMIZATION := LOW, \ |
953 CFLAGS := $(CFLAGS_JDKLIB), \ |
961 CFLAGS := $(CFLAGS_JDKLIB), \ |
959 $(call SET_SHARED_LIBRARY_ORIGIN) \ |
967 $(call SET_SHARED_LIBRARY_ORIGIN) \ |
960 -Wl$(COMMA)-rpath$(COMMA)@loader_path \ |
968 -Wl$(COMMA)-rpath$(COMMA)@loader_path \ |
961 -L$(INSTALL_LIBRARIES_HERE), \ |
969 -L$(INSTALL_LIBRARIES_HERE), \ |
962 LIBS := -lawt -losxapp -lawt_lwawt \ |
970 LIBS := -lawt -losxapp -lawt_lwawt \ |
963 -framework Cocoa \ |
971 -framework Cocoa \ |
|
972 -framework Metal \ |
964 -framework Carbon \ |
973 -framework Carbon \ |
965 -framework ApplicationServices \ |
974 -framework ApplicationServices \ |
966 -framework JavaNativeFoundation \ |
975 -framework JavaNativeFoundation \ |
967 -framework JavaRuntimeSupport \ |
976 -framework JavaRuntimeSupport \ |
968 -ljava -ljvm, \ |
977 -ljava -ljvm, \ |
969 )) |
978 )) |
970 |
979 |
971 TARGETS += $(BUILD_LIBOSXUI) |
980 TARGETS += $(BUILD_LIBOSXUI) |
|
981 $(BUILD_LIBOSXUI): CompileMetalShaders |
972 |
982 |
973 $(BUILD_LIBOSXUI): $(BUILD_LIBAWT) |
983 $(BUILD_LIBOSXUI): $(BUILD_LIBAWT) |
974 |
984 |
975 $(BUILD_LIBOSXUI): $(call FindLib, $(MODULE), osxapp) |
985 $(BUILD_LIBOSXUI): $(call FindLib, $(MODULE), osxapp) |
976 |
986 |