Changeset 37186 in vbox

Timestamp:

May 23, 2011 3:29:24 PM (14 years ago)

Author:

vboxsync

Message:

Config.kmk: Workaround lion java / SDK screw up.

File:

• trunk/Config.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -4812 +4812 @@
  VBOX_JAR       = $(VBOX_JAVA_COMMANDS)/jar
  VBOX_WSIMPORT  = $(VBOX_JAVA_COMMANDS)/wsimport
- VBOX_JAVA_INC  = $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Headers
+ if $(VBOX_XCODE_VERSION_MAJOR) >= 4 # Lion (4.1-preview 5) has a broken CurrentJDK link.  Blindly applying it to 4.0.
+  VBOX_JAVA_INC  = $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers
+ else
+  VBOX_JAVA_INC  = $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Headers
+ endif
 
 else