- update osx bullet natives

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8497 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
3.0
nor..67 13 years ago
parent 4ba3abcda9
commit dd5365891f
  1. BIN
      engine/lib/bullet/jME3-bullet-natives.jar
  2. BIN
      engine/lib/bullet/jarcontent/native/macosx/libbulletjme.jnilib
  3. 8
      engine/src/bullet/native/build.xml
  4. 4
      engine/src/bullet/native/bullet.properties
  5. 8
      engine/src/bullet/native/com_jme3_bullet_objects_VehicleWheel.h

@ -144,8 +144,8 @@
<includepath path="${bullet.osx.java.include}"/> <includepath path="${bullet.osx.java.include}"/>
<includepath path="${bullet.bullet.include}"/> <includepath path="${bullet.bullet.include}"/>
<compilerarg value="-syslibroot ${bullet.osx.syslibroot}"/> <compilerarg value="-syslibroot ${bullet.osx.syslibroot}"/>
<compilerarg value="-arch"/> <!--compilerarg value="-arch"/>
<compilerarg value="ppc"/> <compilerarg value="ppc"/-->
<compilerarg value="-arch"/> <compilerarg value="-arch"/>
<compilerarg value="i386"/> <compilerarg value="i386"/>
<compilerarg value="-arch"/> <compilerarg value="-arch"/>
@ -156,8 +156,8 @@
<libset dir="${bullet.folder}/src/BulletDynamics" libs="BulletDynamics"/> <libset dir="${bullet.folder}/src/BulletDynamics" libs="BulletDynamics"/>
<libset dir="${bullet.folder}/src/BulletCollision" libs="BulletCollision"/> <libset dir="${bullet.folder}/src/BulletCollision" libs="BulletCollision"/>
<libset dir="${bullet.folder}/src/LinearMath" libs="LinearMath"/> <libset dir="${bullet.folder}/src/LinearMath" libs="LinearMath"/>
<linkerarg value="-arch"/> <!--linkerarg value="-arch"/>
<linkerarg value="ppc"/> <linkerarg value="ppc"/-->
<linkerarg value="-arch"/> <linkerarg value="-arch"/>
<linkerarg value="i386"/> <linkerarg value="i386"/>
<linkerarg value="-arch"/> <linkerarg value="-arch"/>

@ -5,14 +5,14 @@ bullet.library.name=bulletjme
bullet.library.version=0.9 bullet.library.version=0.9
# change if bullet folder has different location # change if bullet folder has different location
bullet.folder=../bullet-trunk bullet.folder=../../bullet-2.79
# compile options # compile options
bullet.compile.debug=false bullet.compile.debug=false
# native library compilation options # native library compilation options
bullet.osx.compiler=g++ 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 # change this to msvc for MS Visual Studio compiler
bullet.windows.compiler=g++ bullet.windows.compiler=g++
bullet.linux.compiler=g++ bullet.linux.compiler=g++

@ -55,14 +55,6 @@ JNIEXPORT void JNICALL Java_com_jme3_bullet_objects_VehicleWheel_getCollisionNor
JNIEXPORT jfloat JNICALL Java_com_jme3_bullet_objects_VehicleWheel_getSkidInfo JNIEXPORT jfloat JNICALL Java_com_jme3_bullet_objects_VehicleWheel_getSkidInfo
(JNIEnv *, jobject, jlong, jint); (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 #ifdef __cplusplus
} }
#endif #endif

Loading…
Cancel
Save