sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- fix build of latest bullet natives (multithreading libs), thanks to @EmpirePhoenix

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10789 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
nor..67 2013-09-17 20:33:39 +00:00
parent 5bc840e57a
commit 0ee9f53c27
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engine/nbproject/build-bullet-natives.xml
View File

@ -537,6 +537,7 @@
<arg value="."/> <arg value="."/>
<arg value="-DLIBRARY_OUTPUT_PATH='${build.folder.resolved}'"/> <arg value="-DLIBRARY_OUTPUT_PATH='${build.folder.resolved}'"/>
<arg value="-DBUILD_SHARED_LIBS=OFF"/> <arg value="-DBUILD_SHARED_LIBS=OFF"/>
<arg value="-DBUILD_MULTITHREADING=ON"/>
<arg value="-DBUILD_EXTRAS:BOOL=OFF"/> <arg value="-DBUILD_EXTRAS:BOOL=OFF"/>
<arg value="-DBUILD_DEMOS:BOOL=OFF"/> <arg value="-DBUILD_DEMOS:BOOL=OFF"/>
<arg value="-DCMAKE_BUILD_TYPE=Release"/> <arg value="-DCMAKE_BUILD_TYPE=Release"/>
@ -555,6 +556,7 @@
<exec executable="${cmake.osx}" dir="${bullet.folder}" failonerror="true"> <exec executable="${cmake.osx}" dir="${bullet.folder}" failonerror="true">
<arg value="-DLIBRARY_OUTPUT_PATH='${build.folder.resolved}'"/> <arg value="-DLIBRARY_OUTPUT_PATH='${build.folder.resolved}'"/>
<arg value="-DBUILD_SHARED_LIBS=OFF"/> <arg value="-DBUILD_SHARED_LIBS=OFF"/>
<arg value="-DBUILD_MULTITHREADING=ON"/>
<arg value="-DCMAKE_OSX_ARCHITECTURES='i386;x86_64'"/> <arg value="-DCMAKE_OSX_ARCHITECTURES='i386;x86_64'"/>
<arg value="-DBUILD_EXTRAS=off"/> <arg value="-DBUILD_EXTRAS=off"/>
<arg value="-DBUILD_DEMOS=off"/> <arg value="-DBUILD_DEMOS=off"/>
@ -577,6 +579,7 @@
<arg value="-DLIBRARY_OUTPUT_PATH='${build.folder.resolved}'"/> <arg value="-DLIBRARY_OUTPUT_PATH='${build.folder.resolved}'"/>
<arg value="-DBUILD_SHARED_LIBS=OFF"/> <arg value="-DBUILD_SHARED_LIBS=OFF"/>
<arg value="-DBUILD_STATIC_LIBS=ON"/> <arg value="-DBUILD_STATIC_LIBS=ON"/>
<arg value="-DBUILD_MULTITHREADING=ON"/>
<!--arg value="-DCMAKE_C_FLAGS=-fPIC"/> <!--arg value="-DCMAKE_C_FLAGS=-fPIC"/>
<arg value="-DCMAKE_CXX_FLAGS=-fPIC"/--> <arg value="-DCMAKE_CXX_FLAGS=-fPIC"/-->
<arg value="-DCMAKE_C_FLAGS=-m32"/> <arg value="-DCMAKE_C_FLAGS=-m32"/>
@ -615,6 +618,7 @@
<arg value="-DLIBRARY_OUTPUT_PATH='${build64.folder.resolved}'"/> <arg value="-DLIBRARY_OUTPUT_PATH='${build64.folder.resolved}'"/>
<arg value="-DBUILD_SHARED_LIBS=OFF"/> <arg value="-DBUILD_SHARED_LIBS=OFF"/>
<arg value="-DBUILD_STATIC_LIBS=ON"/> <arg value="-DBUILD_STATIC_LIBS=ON"/>
<arg value="-DBUILD_MULTITHREADING=ON"/>
<arg value="-DCMAKE_C_FLAGS=-fPIC"/> <arg value="-DCMAKE_C_FLAGS=-fPIC"/>
<arg value="-DCMAKE_CXX_FLAGS=-fPIC"/> <arg value="-DCMAKE_CXX_FLAGS=-fPIC"/>
<arg value="-DBUILD_EXTRAS=off"/> <arg value="-DBUILD_EXTRAS=off"/>
@ -643,6 +647,7 @@
<exec executable="${cmake.linux}" dir="${bullet.folder}" failonerror="true"> <exec executable="${cmake.linux}" dir="${bullet.folder}" failonerror="true">
<arg value="-DCMAKE_BUILD_TYPE=Release"/> <arg value="-DCMAKE_BUILD_TYPE=Release"/>
<arg value="-DBUILD_SHARED_LIBS=OFF"/> <arg value="-DBUILD_SHARED_LIBS=OFF"/>
<arg value="-DBUILD_MULTITHREADING=ON"/>
<arg value="-DBUILD_EXTRAS=OFF"/> <arg value="-DBUILD_EXTRAS=OFF"/>
<arg value="-DBUILD_DEMOS=OFF"/> <arg value="-DBUILD_DEMOS=OFF"/>
<arg value="-DLIBRARY_OUTPUT_PATH='${build-mingw.folder.resolved}'"/> <arg value="-DLIBRARY_OUTPUT_PATH='${build-mingw.folder.resolved}'"/>
@ -684,6 +689,7 @@
<exec executable="${cmake.linux}" dir="${bullet.folder}" failonerror="true"> <exec executable="${cmake.linux}" dir="${bullet.folder}" failonerror="true">
<arg value="-DCMAKE_BUILD_TYPE=Release"/> <arg value="-DCMAKE_BUILD_TYPE=Release"/>
<arg value="-DBUILD_SHARED_LIBS=OFF"/> <arg value="-DBUILD_SHARED_LIBS=OFF"/>
<arg value="-DBUILD_MULTITHREADING=ON"/>
<arg value="-DBUILD_EXTRAS=OFF"/> <arg value="-DBUILD_EXTRAS=OFF"/>
<arg value="-DBUILD_DEMOS=OFF"/> <arg value="-DBUILD_DEMOS=OFF"/>
<arg value="-DCMAKE_CXX_FLAGS=-fpermissive"/> <arg value="-DCMAKE_CXX_FLAGS=-fpermissive"/>