Update linux32 native bullet

diff --git a/engine/lib/bullet/jME3-bullet-natives.jar b/engine/lib/bullet/jME3-bullet-natives.jar
index 7c3460b..a02ed64 100644 (file)
Binary files a/engine/lib/bullet/jME3-bullet-natives.jar and b/engine/lib/bullet/jME3-bullet-natives.jar differ

diff --git a/engine/lib/bullet/jME3-bullet.jar b/engine/lib/bullet/jME3-bullet.jar
index f685143..062a2c2 100644 (file)
Binary files a/engine/lib/bullet/jME3-bullet.jar and b/engine/lib/bullet/jME3-bullet.jar differ

diff --git a/engine/lib/bullet/jarcontent/native/linux/libbulletjme.so b/engine/lib/bullet/jarcontent/native/linux/libbulletjme.so
index 5290b9a..7eccaca 100755 (executable)
Binary files a/engine/lib/bullet/jarcontent/native/linux/libbulletjme.so and b/engine/lib/bullet/jarcontent/native/linux/libbulletjme.so differ

diff --git a/engine/src/bullet/native/bullet.properties b/engine/src/bullet/native/bullet.properties
index cd85e8b..cb953f7 100644 (file)
--- a/engine/src/bullet/native/bullet.properties
+++ b/engine/src/bullet/native/bullet.properties
@@ -7,8 +7,8 @@ bullet.library.version=0.9
 # change if bullet folder has different location
 # bullet.folder=../bullet-trunk
 #bullet.folder=c:/tmp/bullet-trunk.win32
-# bullet.folder=../bullet-trunk.linux
-bullet.folder=../bullet-trunk.macosx2
+bullet.folder=../bullet-2.81-linux
+# bullet.folder=../bullet-trunk.macosx2
 #bullet.folder=../bullet-trunk.solaris
 # bullet.folder=../bullet-trunk.solaris64
 # compile options
@@ -23,8 +23,8 @@ bullet.linux.compiler=g++
 bullet.solaris.compiler=g++
 # native header include directories
 #bullet.java.include=${java.home}/../include:${java.home}/../include/win32
-bullet.java.include=${java.home}/../include:${java.home}/../include/solaris
-# bullet.java.include=${java.home}/../include:${java.home}/../include/linux
+# bullet.java.include=${java.home}/../include:${java.home}/../include/solaris
+bullet.java.include=${java.home}/../include:${java.home}/../include/linux
 # OSX has no JRE, only JDK
 # bullet.osx.java.include=${java.home}/include
 bullet.osx.java.include=/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers

diff --git a/engine/src/bullet/native/com_jme3_bullet_PhysicsSpace.h b/engine/src/bullet/native/com_jme3_bullet_PhysicsSpace.h
index 8dd476c..41201b5 100644 (file)
--- a/engine/src/bullet/native/com_jme3_bullet_PhysicsSpace.h
+++ b/engine/src/bullet/native/com_jme3_bullet_PhysicsSpace.h
@@ -13,8 +13,6 @@ extern "C" {
 #define com_jme3_bullet_PhysicsSpace_AXIS_Y 1L
 #undef com_jme3_bullet_PhysicsSpace_AXIS_Z
 #define com_jme3_bullet_PhysicsSpace_AXIS_Z 2L
-/* Inaccessible static: pQueueTL */
-/* Inaccessible static: physicsSpaceTL */
 /*
  * Class:     com_jme3_bullet_PhysicsSpace
  * Method:    createPhysicsSpace