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

native bullet build:

Browse Source 
- use build folder for windows build products

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8912 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
nor..67 2011-12-09 19:33:53 +00:00
parent 33a8268586
commit 6152155c61
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -426,7 +426,7 @@
<linkerarg value="-o${bullet.library.name}.dll" /> <linkerarg value="-o${bullet.library.name}.dll" />
<linkerarg value="--kill-at" /> <linkerarg value="--kill-at" />
<linkerarg value="-static"/> <linkerarg value="-static"/>
<libset dir="${bullet.folder}/lib" libs="BulletMultiThreaded,BulletDynamics,BulletCollision,LinearMath"/> <libset dir="build/bullet-base" libs="BulletMultiThreaded,BulletDynamics,BulletCollision,LinearMath"/>
</linker> </linker>
</cc> </cc>
<delete file="${bullet.output.dir}/windows/history.xml"/> <delete file="${bullet.output.dir}/windows/history.xml"/>
@ -487,10 +487,12 @@
</target> </target>
<target name="-compile-bullet-sources-windows" if="doBuildWindowsBase"> <target name="-compile-bullet-sources-windows" if="doBuildWindowsBase">
<!--TODO: doesn't use build folder..--> <mkdir dir="build/bullet-base"/>
<property location="build/bullet-base" name="build.folder.resolved"/>
<replace file="${bullet.folder}/CMakeLists.txt" token="#TODO add better GLUT detection for MinGW" value=" INCLUDE_DIRECTORIES($${BULLET_PHYSICS_SOURCE_DIR}/Glut)${line.separator}SET(GLUT_glut_LIBRARY $${BULLET_PHYSICS_SOURCE_DIR}/Glut/glut32.lib)"/> <replace file="${bullet.folder}/CMakeLists.txt" token="#TODO add better GLUT detection for MinGW" value=" INCLUDE_DIRECTORIES($${BULLET_PHYSICS_SOURCE_DIR}/Glut)${line.separator}SET(GLUT_glut_LIBRARY $${BULLET_PHYSICS_SOURCE_DIR}/Glut/glut32.lib)"/>
<exec executable="${cmake.windows}" dir="${bullet.folder}" failonerror="true"> <exec executable="${cmake.windows}" dir="${bullet.folder}" failonerror="true">
<arg value="."/> <arg value="."/>
<arg value="-DLIBRARY_OUTPUT_PATH='${build.folder.resolved}'"/>
<arg value="-DBUILD_SHARED_LIBS=OFF"/> <arg value="-DBUILD_SHARED_LIBS=OFF"/>
<arg value="-DBUILD_EXTRAS:BOOL=OFF"/> <arg value="-DBUILD_EXTRAS:BOOL=OFF"/>
<arg value="-DBUILD_DEMOS:BOOL=OFF"/> <arg value="-DBUILD_DEMOS:BOOL=OFF"/>