make/lib/Awt2dLibraries.gmk

rev 10352 : 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
Summary: Build system tweaks to allow building on OS X 10.9 and later
Reviewed-by:

*** 317,327 ****
    LIBAWT_FILES += porting_aix.c
  endif
  
  ifeq ($(OPENJDK_TARGET_OS), macosx)
    LIBAWT_FILES += awt_LoadLibrary.c
-   LIBAWT_CFLAGS += -F/System/Library/Frameworks/JavaVM.framework/Frameworks
  endif
  
  ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc)
    LIBAWT_CFLAGS += -DMLIB_ADD_SUFF
    LIBAWT_CFLAGS += -xarch=sparcvis
--- 317,326 ----
*** 483,493 ****
      LDFLAGS_SUFFIX_solaris := -ljvm $(LIBM) $(LIBDL) -ljava -lc, \
      LDFLAGS_SUFFIX_aix :=-ljvm $(LIBM) $(LIBDL) -ljava -lm,\
      LDFLAGS_SUFFIX_macosx := -lmlib_image -ljvm $(LIBM) \
          -framework Cocoa \
          -framework OpenGL \
-         -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
          -framework JavaNativeFoundation \
          -framework JavaRuntimeSupport \
          -framework ApplicationServices \
          -framework AudioToolbox \
          -ljava, \
--- 482,491 ----
*** 1118,1133 ****
          -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
          -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
          -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/jdga \
          $(foreach dir, $(LIBAWT_HEADLESS_DIRS), -I$(dir))
  
-     ifeq ($(OPENJDK_TARGET_OS), macosx)
-       LIBAWT_HEADLESS_CFLAGS += \
-           -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
-           -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks
-     endif
- 
      LIBAWT_HEADLESS_FILES := \
          awt_Font.c \
          HeadlessToolkit.c \
          fontpath.c \
          VDrawingArea.c \
--- 1116,1125 ----
*** 1215,1226 ****
    LIBSPLASHSCREEN_CFLAGS := -DSPLASHSCREEN -DPNG_NO_MMX_CODE \
        $(foreach dir, $(LIBSPLASHSCREEN_DIRS), -I$(dir))
  
    ifeq ($(OPENJDK_TARGET_OS), macosx)
      LIBSPLASHSCREEN_CFLAGS := -I$(JDK_TOPDIR)/src/macosx/native/sun/awt/splashscreen \
!         $(LIBSPLASHSCREEN_CFLAGS) \
!         -F/System/Library/Frameworks/JavaVM.framework/Frameworks
      LIBSPLASHSCREEN_CFLAGS += -DWITH_MACOSX
      LIBSPLASHSCREEN_CFLAGS += -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp
  
      LIBSPLASHSCREEN_java_awt_SplashScreen.c_CFLAGS := -x objective-c -O0
      LIBSPLASHSCREEN_splashscreen_gfx_impl.c_CFLAGS := -x objective-c -O0
--- 1207,1217 ----
    LIBSPLASHSCREEN_CFLAGS := -DSPLASHSCREEN -DPNG_NO_MMX_CODE \
        $(foreach dir, $(LIBSPLASHSCREEN_DIRS), -I$(dir))
  
    ifeq ($(OPENJDK_TARGET_OS), macosx)
      LIBSPLASHSCREEN_CFLAGS := -I$(JDK_TOPDIR)/src/macosx/native/sun/awt/splashscreen \
!         $(LIBSPLASHSCREEN_CFLAGS)
      LIBSPLASHSCREEN_CFLAGS += -DWITH_MACOSX
      LIBSPLASHSCREEN_CFLAGS += -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp
  
      LIBSPLASHSCREEN_java_awt_SplashScreen.c_CFLAGS := -x objective-c -O0
      LIBSPLASHSCREEN_splashscreen_gfx_impl.c_CFLAGS := -x objective-c -O0
*** 1248,1258 ****
    ifeq ($(OPENJDK_TARGET_OS), macosx)
      LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(LIBM) -lpthread -liconv -losxapp \
          -framework ApplicationServices \
          -framework Foundation \
          -framework Cocoa \
-         -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
          -framework JavaNativeFoundation
    else ifeq ($(OPENJDK_TARGET_OS), windows)
      LIBSPLASHSCREEN_LDFLAGS_SUFFIX += kernel32.lib user32.lib gdi32.lib delayimp.lib -DELAYLOAD:user32.dll
    else ifeq ($(OPENJDK_TARGET_OS), solaris)
      # Solaris still uses OPENWIN_LIB ..
--- 1239,1248 ----
*** 1434,1457 ****
            -I$(JDK_TOPDIR)/src/solaris/native/sun/java2d \
            -I$(JDK_TOPDIR)/src/share/native/sun/awt/image \
            -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
            -I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \
            -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \
!           -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
!           -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
!           -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks, \
        LDFLAGS := $(LDFLAGS_JDKLIB) \
            $(call SET_SHARED_LIBRARY_ORIGIN), \
        LDFLAGS_SUFFIX_macosx := -lawt -lmlib_image -losxapp -ljvm $(LIBM) \
            -framework Accelerate \
            -framework ApplicationServices \
            -framework AudioToolbox \
            -framework Carbon \
            -framework Cocoa \
            -framework Security \
            -framework ExceptionHandling \
-           -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
            -framework JavaNativeFoundation \
            -framework JavaRuntimeSupport \
            -framework OpenGL \
            -framework QuartzCore -ljava, \
        OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libawt_lwawt, \
--- 1424,1444 ----
            -I$(JDK_TOPDIR)/src/solaris/native/sun/java2d \
            -I$(JDK_TOPDIR)/src/share/native/sun/awt/image \
            -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
            -I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \
            -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \
!           -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug, \
        LDFLAGS := $(LDFLAGS_JDKLIB) \
            $(call SET_SHARED_LIBRARY_ORIGIN), \
        LDFLAGS_SUFFIX_macosx := -lawt -lmlib_image -losxapp -ljvm $(LIBM) \
            -framework Accelerate \
            -framework ApplicationServices \
            -framework AudioToolbox \
            -framework Carbon \
            -framework Cocoa \
            -framework Security \
            -framework ExceptionHandling \
            -framework JavaNativeFoundation \
            -framework JavaRuntimeSupport \
            -framework OpenGL \
            -framework QuartzCore -ljava, \
        OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libawt_lwawt, \
*** 1480,1499 ****
        LANG := C, \
        OPTIMIZATION := LOW, \
        CFLAGS := $(CFLAGS_JDKLIB) \
            -I$(JDK_TOPDIR)/src/macosx/native/com/apple/laf \
            -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp \
!           -I$(JDK_TOPDIR)/src/macosx/native/sun/awt \
!           -F/System/Library/Frameworks/JavaVM.framework/Frameworks, \
        LDFLAGS := $(LDFLAGS_JDKLIB) \
            $(call SET_SHARED_LIBRARY_ORIGIN) \
            -Xlinker -rpath -Xlinker @loader_path, \
        LDFLAGS_SUFFIX_macosx := -lawt -losxapp -lawt_lwawt \
            -framework Cocoa \
            -framework Carbon \
            -framework ApplicationServices \
-           -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
            -framework JavaNativeFoundation \
            -framework JavaRuntimeSupport \
            -ljava -ljvm, \
        OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libosxui, \
        DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
--- 1467,1484 ----
        LANG := C, \
        OPTIMIZATION := LOW, \
        CFLAGS := $(CFLAGS_JDKLIB) \
            -I$(JDK_TOPDIR)/src/macosx/native/com/apple/laf \
            -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp \
!           -I$(JDK_TOPDIR)/src/macosx/native/sun/awt, \
        LDFLAGS := $(LDFLAGS_JDKLIB) \
            $(call SET_SHARED_LIBRARY_ORIGIN) \
            -Xlinker -rpath -Xlinker @loader_path, \
        LDFLAGS_SUFFIX_macosx := -lawt -losxapp -lawt_lwawt \
            -framework Cocoa \
            -framework Carbon \
            -framework ApplicationServices \
            -framework JavaNativeFoundation \
            -framework JavaRuntimeSupport \
            -ljava -ljvm, \
        OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libosxui, \
        DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))