diff --git a/Bullet/CMakeLists.txt b/Bullet/CMakeLists.txt index cee71d833..c1f50a006 100644 --- a/Bullet/CMakeLists.txt +++ b/Bullet/CMakeLists.txt @@ -15,6 +15,7 @@ ADD_LIBRARY(LibBulletCollision CollisionDispatch/CollisionWorld.cpp CollisionDispatch/CompoundCollisionAlgorithm.cpp CollisionDispatch/ConvexConcaveCollisionAlgorithm.cpp + CollisionDispatch/SphereSphereCollisionAlgorithm.cpp CollisionDispatch/ConvexConvexAlgorithm.cpp CollisionDispatch/EmptyCollisionAlgorithm.cpp CollisionDispatch/ManifoldResult.cpp diff --git a/Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp b/Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp index dc45b6ba9..506869164 100644 --- a/Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp +++ b/Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp @@ -78,7 +78,7 @@ bool useCompound = false;//true;//false; #ifdef _DEBUG const int numObjects = 250; #else -const int numObjects = 3250; +const int numObjects = 250; #endif const int maxNumObjects = 32760; diff --git a/configure.ac b/configure.ac index bef369487..1a12f632c 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ AC_PREREQ([2.54]) #---------------------------------------------------------------------------- AC_INIT( [bullet], - [1.9], + [2.0], [bullet@erwincoumans.com]) CS_PACKAGEINFO( [Bullet Continuous Collision Detection and Physics Library],