From f746c6cfb251478c10fa5d2df2d92f8855cb7cdc Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Tue, 14 Jul 2015 22:15:29 +0200 Subject: Use GlueGen's JNI header for native compilation (java.includes.dir, java.includes.dir.platform) Using the same cross-platform JNI header for native compilation as for GlueGen code generation allows using a more determined (well defined) and simplified environment. --- make/gluegen-cpptasks-base.xml | 38 ++++++++++++-------------------------- 1 file changed, 12 insertions(+), 26 deletions(-) (limited to 'make/gluegen-cpptasks-base.xml') diff --git a/make/gluegen-cpptasks-base.xml b/make/gluegen-cpptasks-base.xml index 426bfae..03c0e38 100755 --- a/make/gluegen-cpptasks-base.xml +++ b/make/gluegen-cpptasks-base.xml @@ -88,9 +88,9 @@ - and the following properties: - - java.home.dir : path to the JDK home directory - - java.includes.dir : path to the JNI headers (.../jdk/include) - - java.includes.dir.platform : path to the platform JNI headers (.../jdk/include/linux) - java.lib.dir.platform : path to the Java library dir (libjawt.so, etc.) + - java.includes.dir : path to the GlueGen JNI headers: gluegen/make/stub_includes/jni + - java.includes.dir.platform : path to the GlueGen Platform JNI headers: gluegen/make/stub_includes/jni/ - - If your project requires only minimal changes to the compiler - configuration, you may be able to simply refer to the @@ -922,7 +922,6 @@ - @@ -930,15 +929,11 @@ value="${java.home}/.."> - - - - + @@ -1519,7 +1514,7 @@ - + @@ -1541,7 +1536,7 @@ - + @@ -1549,25 +1544,13 @@ - - - - - + - - - @@ -1585,19 +1568,22 @@ - + - + - + + + + -- cgit v1.2.3