[fixed] excludes didn't work in AndroidNdkScriptGenerator.

diff --git a/extensions/gdx-bullet/bullet/jni/Android.mk b/extensions/gdx-bullet/bullet/jni/Android.mk
index 7b07701..acc2e60 100644 (file)
--- a/extensions/gdx-bullet/bullet/jni/Android.mk
+++ b/extensions/gdx-bullet/bullet/jni/Android.mk
@@ -124,12 +124,6 @@ LOCAL_SRC_FILES := com.badlogic.gdx.physics.bullet.collision.BulletObject.cpp\
        src/BulletMultiThreaded/btGpu3DGridBroadphase.cpp\
        src/BulletMultiThreaded/btParallelConstraintSolver.cpp\
        src/BulletMultiThreaded/btThreadSupportInterface.cpp\
-       src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/btSoftBodySolver_DX11.cpp\
-       src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/btSoftBodySolver_DX11SIMDAware.cpp\
-       src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolverOutputCLtoGL.cpp\
-       src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolver_OpenCL.cpp\
-       src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolver_OpenCLSIMDAware.cpp\
-       src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/MiniCL/MiniCLTaskWrap.cpp\
        src/BulletMultiThreaded/PosixThreadSupport.cpp\
        src/BulletMultiThreaded/SequentialThreadSupport.cpp\
        src/BulletMultiThreaded/SpuCollisionObjectWrapper.cpp\

diff --git a/extensions/gdx-bullet/bullet/libs/windows32/bullet.dll b/extensions/gdx-bullet/bullet/libs/windows32/bullet.dll
index 32f1892..2ad9cfb 100644 (file)
Binary files a/extensions/gdx-bullet/bullet/libs/windows32/bullet.dll and b/extensions/gdx-bullet/bullet/libs/windows32/bullet.dll differ

diff --git a/extensions/gdx-jnigen/src/com/badlogic/gdx/jnigen/AndroidNdkScriptGenerator.java b/extensions/gdx-jnigen/src/com/badlogic/gdx/jnigen/AndroidNdkScriptGenerator.java
index f319bbe..8500dbf 100644 (file)
--- a/extensions/gdx-jnigen/src/com/badlogic/gdx/jnigen/AndroidNdkScriptGenerator.java
+++ b/extensions/gdx-jnigen/src/com/badlogic/gdx/jnigen/AndroidNdkScriptGenerator.java
@@ -26,8 +26,8 @@ public class AndroidNdkScriptGenerator {
                \r
                idx = 0;\r
                String[] excludes = new String[target.cExcludes.length + target.cppExcludes.length];\r
-               for(String exclude: target.cExcludes) excludes[idx++] = exclude;\r
-               for(String exclude: target.cppExcludes) excludes[idx++] = exclude;\r
+               for(String exclude: target.cExcludes) excludes[idx++] = config.jniDir + "/" + exclude;\r
+               for(String exclude: target.cppExcludes) excludes[idx++] = config.jniDir + "/" + exclude;\r
                gatherSourceFiles(config.jniDir, includes, excludes, files);\r
                \r
                // create androidManifest.xml if it doesn't exist.\r
@@ -78,7 +78,7 @@ public class AndroidNdkScriptGenerator {
                                gatherSourceFiles(child, includes, excludes, files);\r
                        }\r
                } else {\r
-                       if(match(fileName, includes)) files.add(file);\r
+                       if(match(fileName, includes) && !match(fileName, excludes)) files.add(file);\r
                }\r
        }\r
        \r