resolve some naming conflicts between Bullet 3.x and Bullet 2.x

add BasicGpuDemo that bridges Bullet 2.x and Bullet 3.x (still preliminary/crashing/instable)
This commit is contained in:
erwincoumans
2013-04-30 18:17:44 -07:00
parent bf7a779562
commit e999903c15
27 changed files with 1581 additions and 51 deletions

View File

@@ -19,6 +19,11 @@
description = "Enable iOS target (requires xcode4)"
}
newoption
{
trigger = "bullet2gpu",
description = "Enable Bullet 2.x GPU using b3GpuDynamicsWorld bridge to Bullet 3.x"
}
configurations {"Release", "Debug"}
configuration "Release"
@@ -124,4 +129,17 @@
-- include "../test/b3DynamicBvhBroadphase"
if _OPTIONS["bullet2gpu"] then
include "../src/LinearMath"
include "../src/BulletCollision"
include "../src/BulletDynamics"
include "../src/BulletSoftBody"
include "../Demos/HelloWorld"
include "../Demos3"
end
end