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

cmake+premake disable OpenGL 3 demos on Mac OSX versions below 10.9

Browse Source 
See also http://www.bulletphysics.org/Bullet/phpBB3/viewtopic.php?f=9&t=10073
Move ConstraintPhysicsSetup to Demos3/bullet3/ConstraintDemo
This commit is contained in:
Erwin Coumans
2014-08-22 14:41:21 -07:00
parent ade897c132
commit 954d488756
10 changed files with 59 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Demos3/AllBullet2Demos/BulletDemoEntries.h
View File

@@ -14,7 +14,7 @@
#include "../bullet2/LuaDemo/LuaPhysicsSetup.h"
#include "../bullet2/ChainDemo/ChainDemo.h"
#include "../../Demos/CcdPhysicsDemo/CcdPhysicsSetup.h"
#include "../../Demos/ConstraintDemo/ConstraintPhysicsSetup.h"
#include "../bullet2/ConstraintDemo/ConstraintPhysicsSetup.h"
#include "../ImportURDFDemo/ImportURDFSetup.h"
#include "../ImportObjDemo/ImportObjSetup.h"
#include "../ImportSTLDemo/ImportSTLSetup.h"

4
Demos3/AllBullet2Demos/CMakeLists.txt
View File

@@ -25,8 +25,8 @@ SET(App_AllBullet2Demos_SRCS
../../Demos/BasicDemo/BasicDemoPhysicsSetup.h
../../Demos/CcdPhysicsDemo/CcdPhysicsSetup.cpp
../../Demos/CcdPhysicsDemo/CcdPhysicsSetup.h
../../Demos/ConstraintDemo/ConstraintPhysicsSetup.cpp
../../Demos/ConstraintDemo/ConstraintPhysicsSetup.h
../bullet2/ConstraintDemo/ConstraintPhysicsSetup.cpp
../bullet2/ConstraintDemo/ConstraintPhysicsSetup.h
../bullet2/FeatherstoneMultiBodyDemo/BulletMultiBodyDemos.cpp
../bullet2/FeatherstoneMultiBodyDemo/BulletMultiBodyDemos.h
../bullet2/FeatherstoneMultiBodyDemo/MultiDofDemo.cpp

4
Demos3/AllBullet2Demos/premake4.lua
View File

@@ -50,8 +50,8 @@
"../../Demos/BasicDemo/BasicDemoPhysicsSetup.h",
"../../Demos/CcdPhysicsDemo/CcdPhysicsSetup.cpp",
"../../Demos/CcdPhysicsDemo/CcdPhysicsSetup.h",
"../../Demos/ConstraintDemo/ConstraintPhysicsSetup.cpp",
"../../Demos/ConstraintDemo/ConstraintPhysicsSetup.h",
"../bullet2/ConstraintDemo/ConstraintPhysicsSetup.cpp",
"../bullet2/ConstraintDemo/ConstraintPhysicsSetup.h",
"../ImportURDFDemo/ImportURDFSetup.cpp",
"../ImportObjDemo/ImportObjSetup.cpp",
"../ImportSTLDemo/ImportSTLSetup.cpp",

4
Demos3/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
if (OPENGL_FOUND)
if (BUILD_BULLET3_DEMOS)
if (BUILD_OPENGL3_DEMOS)
SUBDIRS( AllBullet2Demos GpuDemos SimpleOpenGL3 )
endif(BUILD_BULLET3_DEMOS)
endif(BUILD_OPENGL3_DEMOS)
endif(OPENGL_FOUND)