From 12ec1a6c41cd60df4f67df4a6332465fb82d9a3c Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Tue, 14 Jul 2015 22:45:51 +0200 Subject: Fix using GlueGen's JNI header for native compilation (java.includes.dir, java.includes.dir.platform) Patch custom make/lib/gluegen-cpptasks--.xml to match using GlueGen's JNI header. Remove 'ignored override' defs of 'java.includes.dir.platform' in build.xml. --- make/build.xml | 5 ----- make/lib/gluegen-cpptasks-android-aarch64.xml | 2 +- make/lib/gluegen-cpptasks-android-armv6.xml | 2 +- make/lib/gluegen-cpptasks-linux-32bit.xml | 2 +- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/make/build.xml b/make/build.xml index e92da5b..c342a47 100644 --- a/make/build.xml +++ b/make/build.xml @@ -250,7 +250,6 @@ - @@ -327,7 +326,6 @@ - @@ -354,7 +352,6 @@ - @@ -380,7 +377,6 @@ - @@ -388,7 +384,6 @@ - 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 @@ - + 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 @@ - + 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 @@ - + -- cgit v1.2.3