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

bullet build script:

Browse Source 
- fix native windows cmake build target

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8892 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
nor..67 2011-12-08 03:39:43 +00:00
parent 8cff873de4
commit 939ef5f730
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -199,7 +199,7 @@
</target>
<target name="-nativelib-linux" if="isLinux">
<echo message="Building Linux version of native bullet"/>
<echo message="Building 32 bit Linux version of native bullet"/>
<mkdir dir="${bullet.output.dir}/linux"/>
<cc name="${bullet.linux.compiler}" warnings="severe" debug="${bullet.compile.debug}" link="shared" outfile="${bullet.output.dir}/linux/${bullet.library.name}" objdir="build/bullet-native">
<fileset dir="${bullet.source.dir}">
@ -219,7 +219,7 @@
</target>
<target name="-nativelib-linux-64" if="isLinux64">
<echo message="Building Linux version of native bullet"/>
<echo message="Building 64 bit Linux version of native bullet"/>
<mkdir dir="${bullet.output.dir}/linux"/>
<cc name="${bullet.linux.compiler}" warnings="severe" debug="${bullet.compile.debug}" link="shared" outfile="${bullet.output.dir}/linux/${bullet.library.name}64" objdir="build/bullet-native-64">
<fileset dir="${bullet.source.dir}">
@ -357,22 +357,15 @@
<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)"/>
<!--property name="cross.compile.target" value="x86_64-w64-mingw32"/-->
<property name="cross.compile.target" value="x86_64-w64-mingw32"/>
<exec executable="${cmake.windows}" dir="${bullet.folder}" failonerror="true">
<arg value="."/>
<arg value="-DBUILD_SHARED_LIBS=OFF"/>
<arg value="-DBUILD_EXTRAS:BOOL=OFF"/>
<arg value="-DBUILD_DEMOS:BOOL=OFF"/>
<arg value="-DCMAKE_BUILD_TYPE=Release"/>
<arg value="-DCMAKE_SYSTEM_NAME=Windows"/>
<arg value="-DCMAKE_C_COMPILER=${cross.compile.target}-gcc"/>
<arg value="-DCMAKE_CXX_COMPILER=${cross.compile.target}-g++"/>
<arg value="-DCMAKE_RC_COMPILER=${cross.compile.target}-windres"/>
<arg value="-DCMAKE_FIND_ROOT_PATH=/usr/${cross.compile.target}"/>
<arg value="-DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER"/>
<arg value="-DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY"/>
<arg value="-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY"/>
<arg value="."/>
<arg value="-G"/>
<arg value="MinGW Makefiles"/>
</exec>
<exec executable="${make.windows}" dir="${bullet.folder}"/>
</target>
@ -431,10 +424,10 @@
value="INCLUDE_DIRECTORIES($${BULLET_PHYSICS_SOURCE_DIR}/Glut)${line.separator}
IF (CMAKE_CL_64)${line.separator}
message('Win64 using Glut/glut64.lib')${line.separator}
SET(GLUT_glut_LIBRARY ${BULLET_PHYSICS_SOURCE_DIR}/Glut/glut64.lib)${line.separator}
SET(GLUT_glut_LIBRARY $${BULLET_PHYSICS_SOURCE_DIR}/Glut/glut64.lib)${line.separator}
ELSE(CMAKE_CL_64)${line.separator}
message('Win32 using Glut/glut32.lib')${line.separator}
SET(GLUT_glut_LIBRARY ${BULLET_PHYSICS_SOURCE_DIR}/Glut/glut32.lib)${line.separator}
message('Win32 using Glut/glut64.lib')${line.separator}
SET(GLUT_glut_LIBRARY $${BULLET_PHYSICS_SOURCE_DIR}/Glut/glut64.lib)${line.separator}
ENDIF (CMAKE_CL_64)${line.separator}"/>
<property name="cross.compile.target" value="x86_64-w64-mingw32"/>
<mkdir dir="build/bullet-base-mingw-64"/>