Update bullet to 2.83.7
This commit is contained in:
parent
201010b6f0
commit
e5747c2faa
1
.gitignore
vendored
1
.gitignore
vendored
@ -19,6 +19,7 @@
|
||||
/jme3-*/build/
|
||||
/jme3-bullet-native/bullet.zip
|
||||
/jme3-bullet-native/bullet-2.82-r2704/
|
||||
/jme3-bullet-native/bullet3-2.83.7/
|
||||
/jme3-android-native/openal-soft/
|
||||
/jme3-android-native/OpenALSoft.zip
|
||||
/jme3-android-native/src/native/jme_decode/STBI/
|
||||
|
@ -11,7 +11,7 @@ jmeVersionTagID = 0
|
||||
buildJavaDoc = true
|
||||
|
||||
# specify if SDK and Native libraries get built
|
||||
buildNativeProjects = false
|
||||
buildNativeProjects = true
|
||||
buildAndroidExamples = false
|
||||
|
||||
# Path to android NDK for building native libraries
|
||||
@ -19,8 +19,8 @@ buildAndroidExamples = false
|
||||
ndkPath = /opt/android-ndk-r10c
|
||||
|
||||
# Path for downloading native Bullet
|
||||
bulletUrl = http://bullet.googlecode.com/files/bullet-2.82-r2704.zip
|
||||
bulletFolder = bullet-2.82-r2704
|
||||
bulletUrl = https://github.com/bulletphysics/bullet3/archive/2.83.7.zip
|
||||
bulletFolder = bullet3-2.83.7
|
||||
bulletZipFile = bullet.zip
|
||||
|
||||
# Path for downloading NetBeans Base
|
||||
|
@ -27,12 +27,13 @@ model {
|
||||
source {
|
||||
srcDir 'src/native/cpp'
|
||||
srcDir bulletSrcPath
|
||||
exclude 'BulletMultiThreaded/GpuSoftBodySolvers/**'
|
||||
exclude 'Bullet3OpenCL/**'
|
||||
include '**/*.cpp'
|
||||
}
|
||||
exportedHeaders {
|
||||
srcDir 'src/native/cpp'
|
||||
srcDir bulletSrcPath
|
||||
exclude 'Bullet3OpenCL/**'
|
||||
include '**/*.h'
|
||||
}
|
||||
}
|
||||
@ -88,6 +89,7 @@ model {
|
||||
cppCompiler.args "-fvisibility=hidden"
|
||||
cppCompiler.args '-I', "$javaHome/include/linux"
|
||||
cppCompiler.args "-fPIC"
|
||||
|
||||
cppCompiler.args "-fpermissive"
|
||||
linker.args "-fvisibility=hidden"
|
||||
} else if (os == "windows") {
|
||||
|
Loading…
x
Reference in New Issue
Block a user