fixed jnigen, was packing non-desktop natives into desktop natives jar...

diff --git a/extensions/gdx-audio/jni/build.xml b/extensions/gdx-audio/jni/build.xml
index 4058165..0f7c662 100644 (file)
--- a/extensions/gdx-audio/jni/build.xml
+++ b/extensions/gdx-audio/jni/build.xml
@@ -24,7 +24,6 @@
                        <fileset dir="../libs/linux32" includes="libgdx-audio.so"/>
                        <fileset dir="../libs/linux64" includes="libgdx-audio64.so"/>
                        <fileset dir="../libs/macosx32" includes="libgdx-audio.dylib"/>
-                       <fileset dir="../libs/android32" includes="libgdx-audio.so"/>
 
                </jar>
        </target>

diff --git a/extensions/gdx-bullet/jni/build.xml b/extensions/gdx-bullet/jni/build.xml
index da65248..68d2e4e 100644 (file)
--- a/extensions/gdx-bullet/jni/build.xml
+++ b/extensions/gdx-bullet/jni/build.xml
@@ -24,8 +24,6 @@
                        <fileset dir="../libs/linux32" includes="libgdx-bullet.so"/>
                        <fileset dir="../libs/linux64" includes="libgdx-bullet64.so"/>
                        <fileset dir="../libs/macosx32" includes="libgdx-bullet.dylib"/>
-                       <fileset dir="../libs/android32" includes="libgdx-bullet.so"/>
-                       <fileset dir="../libs/ios32" includes="libgdx-bullet.a"/>
 
                </jar>
        </target>

diff --git a/extensions/gdx-freetype/jni/build.xml b/extensions/gdx-freetype/jni/build.xml
index ec78c63..9cae0d8 100644 (file)
--- a/extensions/gdx-freetype/jni/build.xml
+++ b/extensions/gdx-freetype/jni/build.xml
@@ -24,8 +24,6 @@
                        <fileset dir="../libs/linux32" includes="libgdx-freetype.so"/>
                        <fileset dir="../libs/linux64" includes="libgdx-freetype64.so"/>
                        <fileset dir="../libs/macosx32" includes="libgdx-freetype.dylib"/>
-                       <fileset dir="../libs/android32" includes="libgdx-freetype.so"/>
-                       <fileset dir="../libs/ios32" includes="libgdx-freetype.a"/>
 
                </jar>
        </target>

diff --git a/extensions/gdx-image/jni/build.xml b/extensions/gdx-image/jni/build.xml
index 5aa7b2c..0ef97a6 100644 (file)
--- a/extensions/gdx-image/jni/build.xml
+++ b/extensions/gdx-image/jni/build.xml
@@ -19,12 +19,11 @@
        
        <target name="pack-natives">
                <jar destfile="../libs/gdx-image-natives.jar">
-                       <fileset dir="../libs/android32" includes="libgdx-image.so"/>
-                       <fileset dir="../libs/windows32" includes="gdx-image.dll"/>
-                       <fileset dir="../libs/windows64" includes="gdx-image64.dll"/>
-                       <fileset dir="../libs/linux32" includes="libgdx-image.so"/>
-                       <fileset dir="../libs/linux64" includes="libgdx-image64.so"/>
-                       <fileset dir="../libs/macosx32" includes="libgdx-image.dylib"/>
+                       <fileset dir="../libs/windows32" includes="libgdx-image.so"/>
+                       <fileset dir="../libs/windows64" includes="gdx-image.dll"/>
+                       <fileset dir="../libs/linux32" includes="gdx-image64.dll"/>
+                       <fileset dir="../libs/linux64" includes="libgdx-image.so"/>
+                       <fileset dir="../libs/macosx32" includes="libgdx-image64.so"/>
 
                </jar>
        </target>

diff --git a/extensions/gdx-jnigen/src/com/badlogic/gdx/jnigen/AntScriptGenerator.java b/extensions/gdx-jnigen/src/com/badlogic/gdx/jnigen/AntScriptGenerator.java
index 2e9908b..ae952f0 100644 (file)
--- a/extensions/gdx-jnigen/src/com/badlogic/gdx/jnigen/AntScriptGenerator.java
+++ b/extensions/gdx-jnigen/src/com/badlogic/gdx/jnigen/AntScriptGenerator.java
@@ -102,7 +102,9 @@ public class AntScriptGenerator {
                                        buildFiles.add(buildFileName);\r
                                } \r
                                sharedLibFiles.add(getSharedLibFilename(target.os, target.is64Bit, config.sharedLibName));\r
-                               libsDirs.add("../" + libsDir.path().replace('\\', '/'));\r
+                               if(target.os != TargetOs.Android && target.os != TargetOs.IOS) {\r
+                                       libsDirs.add("../" + libsDir.path().replace('\\', '/'));\r
+                               }\r
                        }\r
                }\r
 \r

diff --git a/gdx/jni/build.xml b/gdx/jni/build.xml
index 077eade..6029115 100644 (file)
--- a/gdx/jni/build.xml
+++ b/gdx/jni/build.xml
@@ -24,8 +24,6 @@
                        <fileset dir="../libs/windows64" includes="gdx64.dll"/>
                        <fileset dir="../libs/linux32" includes="libgdx.so"/>
                        <fileset dir="../libs/linux64" includes="libgdx64.so"/>
-                       <fileset dir="../libs/android32" includes="libgdx.so"/>
-                       <fileset dir="../libs/ios32" includes="libgdx.a"/>
 
                </jar>
        </target>