diff options
| author | Sven Gothel <[email protected]> | 2011-04-20 18:32:02 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2011-04-20 18:32:02 +0200 |
| commit | 7bffb67bdfbaaf24317fd308399572f60cd15b9c (patch) | |
| tree | a1c2505d9e4ad5a22589ee2ea8fc41b86eee601d /make | |
| parent | ef257dc5d74224a046f4a4cf0bc1a5fb8aa417cb (diff) | |
osx fix: query availability of JVM header, ie
- /System/Library/Frameworks/JavaVM.framework/Headers/ Java 10.6 Update 4
- /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Headers/ Prev. Version
Diffstat (limited to 'make')
| -rwxr-xr-x | make/gluegen-cpptasks-base.xml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/make/gluegen-cpptasks-base.xml b/make/gluegen-cpptasks-base.xml index ced58c0..ac09037 100755 --- a/make/gluegen-cpptasks-base.xml +++ b/make/gluegen-cpptasks-base.xml @@ -923,7 +923,12 @@ <echo message="MacOSX" /> <property name="compiler.cfg.id.base" value="compiler.cfg.macosx" /> <property name="linker.cfg.id.base" value="linker.cfg.macosx" /> - <property name="java.includes.dir.platform" value="/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Headers" /> + <!-- Need to select either Java 10.6 Update 4's location or the old one --> + <condition property="java.includes.dir.platform" + value="/System/Library/Frameworks/JavaVM.framework/Headers" + else="/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Headers"> + <available file="/System/Library/Frameworks/JavaVM.framework/Headers/jni.h"/> + </condition> <property name="java.lib.dir.platform" value="/System/Library/Frameworks/JavaVM.framework/Libraries" /> </target> |