summaryrefslogtreecommitdiffstats
path: root/make/gluegen-cpptasks-base.xml
diff options
context:
space:
mode:
Diffstat (limited to 'make/gluegen-cpptasks-base.xml')
-rwxr-xr-xmake/gluegen-cpptasks-base.xml7
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>