Print this page
Added gradle and cmake project

Split Close
Expand all
Collapse all
          --- old/make/lib/Awt2dLibraries.gmk
          +++ new/make/lib/Awt2dLibraries.gmk
↓ open down ↓ 238 lines elided ↑ open up ↑
 239  239          -delayload:winspool.drv -delayload:imm32.dll \
 240  240          -delayload:ole32.dll -delayload:comdlg32.dll \
 241  241          -delayload:comctl32.dll -delayload:shlwapi.dll, \
 242  242      LIBS_unix := -ljvm -ljava $(LIBM), \
 243  243      LIBS_linux :=  $(LIBDL), \
 244  244      LIBS_solaris := $(LIBDL), \
 245  245      LIBS_aix := $(LIBDL),\
 246  246      LIBS_macosx := -lmlib_image \
 247  247          -framework Cocoa \
 248  248          -framework OpenGL \
      249 +        -framework Metal \
      250 +        -framework MetalKit \
 249  251          -framework JavaNativeFoundation \
 250  252          -framework JavaRuntimeSupport \
 251  253          -framework ApplicationServices \
 252  254          -framework AudioToolbox, \
 253  255      LIBS_windows := kernel32.lib user32.lib gdi32.lib winspool.lib \
 254  256          imm32.lib ole32.lib uuid.lib shell32.lib \
 255  257          comdlg32.lib winmm.lib comctl32.lib shlwapi.lib \
 256  258          delayimp.lib jvm.lib $(WIN_JAVA_LIB) advapi32.lib, \
 257  259      VERSIONINFO_RESOURCE := $(LIBAWT_VERSIONINFO_RESOURCE), \
 258  260      RC_FLAGS := $(RC_FLAGS) $(LIBAWT_RC_FLAGS) \
↓ open down ↓ 556 lines elided ↑ open up ↑
 815  817    endif
 816  818  
 817  819    LIBSPLASHSCREEN_LIBS :=
 818  820  
 819  821    ifeq ($(OPENJDK_TARGET_OS), macosx)
 820  822      LIBSPLASHSCREEN_LIBS += \
 821  823          $(LIBM) -lpthread -liconv -losxapp \
 822  824          -framework ApplicationServices \
 823  825          -framework Foundation \
 824  826          -framework Cocoa \
      827 +        -framework Metal \
      828 +        -framework MetalKit \
 825  829          -framework JavaNativeFoundation
 826  830    else ifeq ($(OPENJDK_TARGET_OS), windows)
 827  831      LIBSPLASHSCREEN_LIBS += kernel32.lib user32.lib gdi32.lib delayimp.lib $(WIN_JAVA_LIB) jvm.lib
 828  832    else
 829  833      LIBSPLASHSCREEN_LIBS += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread -ldl
 830  834    endif
 831  835  
 832  836    LIBSPLASHSCREEN_HEADER_DIRS += \
 833  837        libosxapp \
 834  838        java.base:include \
↓ open down ↓ 42 lines elided ↑ open up ↑
 877  881        $(TOPDIR)/src/$(MODULE)/unix/native/common/awt \
 878  882        $(TOPDIR)/src/$(MODULE)/share/native/common/font \
 879  883        $(TOPDIR)/src/$(MODULE)/share/native/common/java2d \
 880  884        #
 881  885  
 882  886    LIBAWT_LWAWT_EXTRA_HEADER_DIRS := \
 883  887        $(LIBAWT_DEFAULT_HEADER_DIRS) \
 884  888        libawt_lwawt/awt \
 885  889        libawt_lwawt/font \
 886  890        libawt_lwawt/java2d/opengl \
      891 +      libawt_lwawt/java2d/metal \
 887  892        include \
 888  893        common/awt/debug \
 889  894        common/java2d/opengl \
 890  895        libosxapp \
 891  896        #
 892  897  
 893  898    LIBAWT_LWAWT_CFLAGS := $(X_CFLAGS) $(X_LIBS)
 894  899  
 895  900    LIBAWT_LWAWT_EXFILES := fontpath.c awt_Font.c X11Color.c
 896  901    LIBAWT_LWAWT_EXCLUDES := $(TOPDIR)/src/$(MODULE)/unix/native/common/awt/medialib
↓ open down ↓ 15 lines elided ↑ open up ↑
 912  917            pointer-arith, \
 913  918        LDFLAGS := $(LDFLAGS_JDKLIB) \
 914  919            $(call SET_SHARED_LIBRARY_ORIGIN) \
 915  920            -L$(INSTALL_LIBRARIES_HERE), \
 916  921        LIBS := -lawt -lmlib_image -losxapp -ljvm $(LIBM) \
 917  922            -framework Accelerate \
 918  923            -framework ApplicationServices \
 919  924            -framework AudioToolbox \
 920  925            -framework Carbon \
 921  926            -framework Cocoa \
      927 +          -framework Metal \
      928 +          -framework MetalKit \
 922  929            -framework Security \
 923  930            -framework ExceptionHandling \
 924  931            -framework JavaNativeFoundation \
 925  932            -framework JavaRuntimeSupport \
 926  933            -framework OpenGL \
 927  934            -framework QuartzCore -ljava, \
 928  935    ))
 929  936  
 930  937    TARGETS += $(BUILD_LIBAWT_LWAWT)
 931  938  
↓ open down ↓ 3 lines elided ↑ open up ↑
 935  942  
 936  943    $(BUILD_LIBAWT_LWAWT): $(call FindLib, $(MODULE), osxapp)
 937  944  
 938  945    $(BUILD_LIBAWT_LWAWT): $(call FindLib, java.base, java)
 939  946  
 940  947  endif
 941  948  
 942  949  ################################################################################
 943  950  
 944  951  ifeq ($(OPENJDK_TARGET_OS), macosx)
      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
 945  957  
 946  958    $(eval $(call SetupJdkLibrary, BUILD_LIBOSXUI, \
 947  959        NAME := osxui, \
 948  960        OPTIMIZATION := LOW, \
 949  961        CFLAGS := $(CFLAGS_JDKLIB), \
 950  962        EXTRA_HEADER_DIRS := \
 951  963            libawt_lwawt/awt \
 952  964            libosxapp, \
 953  965        DISABLED_WARNINGS_clang := deprecated-declarations sign-compare, \
 954  966        LDFLAGS := $(LDFLAGS_JDKLIB) \
 955  967            $(call SET_SHARED_LIBRARY_ORIGIN) \
 956  968            -Wl$(COMMA)-rpath$(COMMA)@loader_path \
 957  969            -L$(INSTALL_LIBRARIES_HERE), \
 958  970        LIBS := -lawt -losxapp -lawt_lwawt \
 959  971            -framework Cocoa \
      972 +          -framework Metal \
      973 +          -framework MetalKit \
      974 +          -framework OpenGL \
 960  975            -framework Carbon \
 961  976            -framework ApplicationServices \
 962  977            -framework JavaNativeFoundation \
 963  978            -framework JavaRuntimeSupport \
 964  979            -ljava -ljvm, \
 965  980    ))
 966  981  
 967  982    TARGETS += $(BUILD_LIBOSXUI)
      983 +  $(BUILD_LIBOSXUI): CompileMetalShaders
 968  984  
 969  985    $(BUILD_LIBOSXUI): $(BUILD_LIBAWT)
 970  986  
 971  987    $(BUILD_LIBOSXUI): $(call FindLib, $(MODULE), osxapp)
 972  988  
 973  989    $(BUILD_LIBOSXUI): $(BUILD_LIBAWT_LWAWT)
 974  990  
 975  991  endif
 976  992  
 977  993  ################################################################################
 978  994  
 979  995  # Hook to include the corresponding custom file, if present.
 980  996  $(eval $(call IncludeCustomExtension, lib/Awt2dLibraries.gmk))
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX