Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

more fixes in the build, related to CMake and some error (don't delete a void* pointer!)

Browse Source 
revert BasicDemo.cpp to original Bullet 2.82 state
This commit is contained in:
Erwin Coumans
2014-05-13 21:52:46 -07:00
parent 9ab755fc07
commit 934df75ea6
8 changed files with 69 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@@ -226,7 +226,13 @@ ENDIF(USE_GLUT)
ENDIF()
ENDIF(BUILD_BULLET2_DEMOS)
OPTION(BUILD_BULLET3_DEMOS "Set when you want to build the Bullet 3 demos" ON)
OPTION(BUILD_BULLET3 "Set when you want to build Bullet 3" ON)
IF(BUILD_BULLET3)
OPTION(BUILD_BULLET3_DEMOS "Set when you want to build the Bullet 3 demos" ON)
ELSE(BUILD_BULLET3)
unset(BUILD_BULLET3_DEMOS CACHE)
OPTION(BUILD_BULLET3_DEMOS "Set when you want to build the Bullet 3 demos" OFF)
ENDIF(BUILD_BULLET3)
IF(BUILD_BULLET3_DEMOS)
IF(EXISTS ${BULLET_PHYSICS_SOURCE_DIR}/Demos3 AND IS_DIRECTORY ${BULLET_PHYSICS_SOURCE_DIR}/Demos3)
SUBDIRS(Demos3)