summaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2019-08-18 01:43:01 +0200
committerSven Gothel <[email protected]>2019-08-18 01:43:01 +0200
commit65195899777be7be194db59bd668d22c70f29145 (patch)
tree776e4d5270dc464a84c2b5eeb26a2bab88507cdb /make
parentf54e4fbaebfec36bd3b523dc4e23f744e8e6a4ef (diff)
Bug 1363: Java 11: Align gluegen-cpptask-custom.xml template to commit f54e4fbaebfec36bd3b523dc4e23f744e8e6a4ef
Diffstat (limited to 'make')
-rw-r--r--make/gluegen-cpptasks-custom.xml6
1 files changed, 5 insertions, 1 deletions
diff --git a/make/gluegen-cpptasks-custom.xml b/make/gluegen-cpptasks-custom.xml
index c05033d..53c13c0 100644
--- a/make/gluegen-cpptasks-custom.xml
+++ b/make/gluegen-cpptasks-custom.xml
@@ -41,8 +41,12 @@
-->
<property name="compiler.cfg.id.base" value="compiler.cfg.linux" />
<property name="linker.cfg.id.base" value="linker.cfg.linux" />
- <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/i386" />
<property name="java.includes.dir.platform" value="${java.includes.dir}/linux" />
+ <available property="java.lib.dir.platform" value="${java.home.dir}/jre/lib/i386"
+ file="${java.home.dir}/jre/lib/i386/libjava.so"/>
+ <available property="java.lib.dir.platform" value="${java.home.dir}/lib/i386"
+ file="${java.home.dir}/lib/i386/libjava.so"/>
+ <property name="java.lib.dir.platform" value="${java.home.dir}/lib"/> <!-- new default -->
</target>
</project>