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

bullet build script:

Browse Source 
- better separation between 32 and 64bit cross-compile windows binaries in config script fix

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8893 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
nor..67 2011-12-08 03:58:06 +00:00
parent 939ef5f730
commit 474687f7aa
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -422,13 +422,14 @@
<target name="-compile-bullet-sources-linux-mingw-64" if="isLinux64" unless="haveBulletLibraryMingw64"> <target name="-compile-bullet-sources-linux-mingw-64" if="isLinux64" unless="haveBulletLibraryMingw64">
<replace file="${bullet.folder}/CMakeLists.txt" token="#TODO add better GLUT detection for MinGW" <replace file="${bullet.folder}/CMakeLists.txt" token="#TODO add better GLUT detection for MinGW"
value="INCLUDE_DIRECTORIES($${BULLET_PHYSICS_SOURCE_DIR}/Glut)${line.separator} value="INCLUDE_DIRECTORIES($${BULLET_PHYSICS_SOURCE_DIR}/Glut)${line.separator}
IF (CMAKE_CL_64)${line.separator} SET(GLUT_INCLUDE_DIR ${BULLET_PHYSICS_SOURCE_DIR}/Glut)${line.separator}
IF (WIN32)${line.separator}
message('Win32 using Glut/glut32.lib')${line.separator}
SET(GLUT_glut_LIBRARY $${BULLET_PHYSICS_SOURCE_DIR}/Glut/glut32.lib)${line.separator}
ELSE(WIN32)${line.separator}
message('Win64 using Glut/glut64.lib')${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} ENDIF (WIN32)${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"/> <property name="cross.compile.target" value="x86_64-w64-mingw32"/>
<mkdir dir="build/bullet-base-mingw-64"/> <mkdir dir="build/bullet-base-mingw-64"/>
<property location="build/bullet-base-mingw-64" name="build-mingw64.folder.resolved"/> <property location="build/bullet-base-mingw-64" name="build-mingw64.folder.resolved"/>