diff --git a/engine/lib/bullet/jME3-bullet-natives.jar b/engine/lib/bullet/jME3-bullet-natives.jar index acbb874fe..1621dfa0f 100644 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/jarcontent/native/macosx/libbulletjme.jnilib b/engine/lib/bullet/jarcontent/native/macosx/libbulletjme.jnilib index b94d6092f..bdae8069f 100755 Binary files a/engine/lib/bullet/jarcontent/native/macosx/libbulletjme.jnilib and b/engine/lib/bullet/jarcontent/native/macosx/libbulletjme.jnilib differ diff --git a/engine/src/bullet/native/build.xml b/engine/src/bullet/native/build.xml index be3afda38..5d8cec521 100644 --- a/engine/src/bullet/native/build.xml +++ b/engine/src/bullet/native/build.xml @@ -144,8 +144,8 @@ - - + @@ -156,8 +156,8 @@ - - + diff --git a/engine/src/bullet/native/bullet.properties b/engine/src/bullet/native/bullet.properties index d8a62a15c..4349035c8 100644 --- a/engine/src/bullet/native/bullet.properties +++ b/engine/src/bullet/native/bullet.properties @@ -5,14 +5,14 @@ bullet.library.name=bulletjme bullet.library.version=0.9 # change if bullet folder has different location -bullet.folder=../bullet-trunk +bullet.folder=../../bullet-2.79 # compile options bullet.compile.debug=false # native library compilation options bullet.osx.compiler=g++ -bullet.osx.syslibroot=/Developer/SDKs/MacOSX10.5.sdk +bullet.osx.syslibroot=/Developer/SDKs/MacOSX10.6.sdk # change this to msvc for MS Visual Studio compiler bullet.windows.compiler=g++ bullet.linux.compiler=g++ diff --git a/engine/src/bullet/native/com_jme3_bullet_objects_VehicleWheel.h b/engine/src/bullet/native/com_jme3_bullet_objects_VehicleWheel.h index edf26a42c..b3dad4bd7 100644 --- a/engine/src/bullet/native/com_jme3_bullet_objects_VehicleWheel.h +++ b/engine/src/bullet/native/com_jme3_bullet_objects_VehicleWheel.h @@ -55,14 +55,6 @@ JNIEXPORT void JNICALL Java_com_jme3_bullet_objects_VehicleWheel_getCollisionNor JNIEXPORT jfloat JNICALL Java_com_jme3_bullet_objects_VehicleWheel_getSkidInfo (JNIEnv *, jobject, jlong, jint); -/* - * Class: com_jme3_bullet_objects_VehicleWheel - * Method: finalizeNative - * Signature: (JI)V - */ -JNIEXPORT void JNICALL Java_com_jme3_bullet_objects_VehicleWheel_finalizeNative - (JNIEnv *, jobject, jlong, jint); - #ifdef __cplusplus } #endif