make/lib/PlatformLibraries.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:

*** 30,47 ****
        OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
        SRC := $(JDK_TOPDIR)/src/macosx/native/apple/applescript, \
        LANG := C, \
        OPTIMIZATION := LOW, \
        CFLAGS := $(CFLAGS_JDKLIB) \
!           -I$(JDK_TOPDIR)/src/macosx/native/apple/applescript \
!           -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
!           -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks, \
        LDFLAGS := $(LDFLAGS_JDKLIB) \
            $(call SET_SHARED_LIBRARY_ORIGIN), \
        LDFLAGS_SUFFIX := -framework Cocoa \
            -framework Carbon \
-           -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
            -framework JavaNativeFoundation \
            $(LDFLAGS_JDKLIB_SUFFIX), \
        OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libAppleScriptEngine, \
        DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
  
--- 30,44 ----
        OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
        SRC := $(JDK_TOPDIR)/src/macosx/native/apple/applescript, \
        LANG := C, \
        OPTIMIZATION := LOW, \
        CFLAGS := $(CFLAGS_JDKLIB) \
!           -I$(JDK_TOPDIR)/src/macosx/native/apple/applescript, \
        LDFLAGS := $(LDFLAGS_JDKLIB) \
            $(call SET_SHARED_LIBRARY_ORIGIN), \
        LDFLAGS_SUFFIX := -framework Cocoa \
            -framework Carbon \
            -framework JavaNativeFoundation \
            $(LDFLAGS_JDKLIB_SUFFIX), \
        OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libAppleScriptEngine, \
        DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
  
*** 61,84 ****
        SRC := $(JDK_TOPDIR)/src/macosx/native/sun/osxapp, \
        LANG := C, \
        OPTIMIZATION := LOW, \
        CFLAGS := $(CFLAGS_JDKLIB) \
            -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp \
!           -I$(JDK_OUTPUTDIR)/gensrc/sun/osxapp \
!           -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 := \
            -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 IOSurface \
            -framework QuartzCore, \
--- 58,78 ----
        SRC := $(JDK_TOPDIR)/src/macosx/native/sun/osxapp, \
        LANG := C, \
        OPTIMIZATION := LOW, \
        CFLAGS := $(CFLAGS_JDKLIB) \
            -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp \
!           -I$(JDK_OUTPUTDIR)/gensrc/sun/osxapp, \
        LDFLAGS := $(LDFLAGS_JDKLIB) \
            $(call SET_SHARED_LIBRARY_ORIGIN), \
        LDFLAGS_SUFFIX_macosx := \
            -framework Accelerate \
            -framework ApplicationServices \
            -framework AudioToolbox \
            -framework Carbon \
            -framework Cocoa \
            -framework Security \
            -framework ExceptionHandling \
            -framework JavaNativeFoundation \
            -framework JavaRuntimeSupport \
            -framework OpenGL \
            -framework IOSurface \
            -framework QuartzCore, \
*** 106,125 ****
        SRC := $(LIBOSX_DIRS), \
        LANG := C, \
        OPTIMIZATION := LOW, \
        CFLAGS := $(CFLAGS_JDKLIB) \
            $(foreach dir, $(LIBOSX_DIRS), -I$(dir)) \
!           -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp \
!           -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 := \
            -losxapp \
            -framework Cocoa \
            -framework ApplicationServices \
-           -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
            -framework JavaNativeFoundation \
            -framework JavaRuntimeSupport \
            -framework Security \
            -framework SystemConfiguration \
            $(LDFLAGS_JDKLIB_SUFFIX), \
--- 100,116 ----
        SRC := $(LIBOSX_DIRS), \
        LANG := C, \
        OPTIMIZATION := LOW, \
        CFLAGS := $(CFLAGS_JDKLIB) \
            $(foreach dir, $(LIBOSX_DIRS), -I$(dir)) \
!           -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp, \
        LDFLAGS := $(LDFLAGS_JDKLIB) \
            $(call SET_SHARED_LIBRARY_ORIGIN), \
        LDFLAGS_SUFFIX_macosx := \
            -losxapp \
            -framework Cocoa \
            -framework ApplicationServices \
            -framework JavaNativeFoundation \
            -framework JavaRuntimeSupport \
            -framework Security \
            -framework SystemConfiguration \
            $(LDFLAGS_JDKLIB_SUFFIX), \