diff options
| author | Sven Gothel <[email protected]> | 2015-07-14 22:45:51 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2015-07-14 22:45:51 +0200 |
| commit | 12ec1a6c41cd60df4f67df4a6332465fb82d9a3c (patch) | |
| tree | 2754a1015d3c57019069318ca7d38d4b1a361960 /make/lib | |
| parent | f746c6cfb251478c10fa5d2df2d92f8855cb7cdc (diff) | |
Fix using GlueGen's JNI header for native compilation (java.includes.dir, java.includes.dir.platform)
Patch custom make/lib/gluegen-cpptasks-<OS>-<ARCH>.xml
to match using GlueGen's JNI header.
Remove 'ignored override' defs of 'java.includes.dir.platform'
in build.xml.
Diffstat (limited to 'make/lib')
| -rw-r--r-- | make/lib/gluegen-cpptasks-android-aarch64.xml | 2 | ||||
| -rw-r--r-- | make/lib/gluegen-cpptasks-android-armv6.xml | 2 | ||||
| -rw-r--r-- | make/lib/gluegen-cpptasks-linux-32bit.xml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/make/lib/gluegen-cpptasks-android-aarch64.xml b/make/lib/gluegen-cpptasks-android-aarch64.xml index e5ae968..de1e1da 100644 --- a/make/lib/gluegen-cpptasks-android-aarch64.xml +++ b/make/lib/gluegen-cpptasks-android-aarch64.xml @@ -126,7 +126,7 @@ <property name="compiler.cfg.id.base" value="compiler.cfg.android" /> <property name="linker.cfg.id.base" value="linker.cfg.android" /> <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/i386" /> - <property name="java.includes.dir.platform" value="${java.includes.dir}/linux" /> + <property name="java.includes.dir.platform" value="${java.includes.dir}/x11" /> </target> <target name="declare.linux.android"> diff --git a/make/lib/gluegen-cpptasks-android-armv6.xml b/make/lib/gluegen-cpptasks-android-armv6.xml index bcb3f53..46b79eb 100644 --- a/make/lib/gluegen-cpptasks-android-armv6.xml +++ b/make/lib/gluegen-cpptasks-android-armv6.xml @@ -128,7 +128,7 @@ <property name="compiler.cfg.id.base" value="compiler.cfg.android" /> <property name="linker.cfg.id.base" value="linker.cfg.android" /> <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/i386" /> - <property name="java.includes.dir.platform" value="${java.includes.dir}/linux" /> + <property name="java.includes.dir.platform" value="${java.includes.dir}/x11" /> </target> <target name="declare.linux.android"> diff --git a/make/lib/gluegen-cpptasks-linux-32bit.xml b/make/lib/gluegen-cpptasks-linux-32bit.xml index 69afca8..025c0fa 100644 --- a/make/lib/gluegen-cpptasks-linux-32bit.xml +++ b/make/lib/gluegen-cpptasks-linux-32bit.xml @@ -44,7 +44,7 @@ <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" /> + <property name="java.includes.dir.platform" value="${java.includes.dir}/x11" /> </target> </project> |