bullet build script:

- move auto-fixing of bullet source config file for windows in right place..

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8888 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
3.0
nor..67 13 years ago
parent ff9d6cc17c
commit 44f02c2784
  1. 2
      engine/nbproject/build-bullet-natives.xml

@ -268,7 +268,6 @@
</target>
<target name="-nativelib-windows" if="isWindows">
<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)"/>
<echo message="Building Windows version of native bullet"/>
<mkdir dir="${bullet.output.dir}/windows"/>
<cc multithreaded="" name="${bullet.windows.compiler}" warnings="none" debug="${bullet.compile.debug}" outtype="shared" outfile="${bullet.output.dir}/windows/${bullet.library.name}" objdir="build/bullet-native">
@ -355,6 +354,7 @@
</target>
<target name="-compile-bullet-sources-windows" if="isWindows">
<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">
<arg value="."/>
<arg value="-DBUILD_SHARED_LIBS=OFF"/>

Loading…
Cancel
Save