Finalised support for compiling BULLET on linux.
authorSimon Clitherow <aphex@nildram.co.uk>
Tue, 2 Aug 2005 18:54:11 +0000 (18:54 +0000)
committerSimon Clitherow <aphex@nildram.co.uk>
Tue, 2 Aug 2005 18:54:11 +0000 (18:54 +0000)
Bullet is now off by default on all platforms until we get an OK
from Erwin. To enable it, change USE_PHYSICS to 'bullet' in your
config.opts.

SConstruct
extern/bullet/BulletDynamics/CollisionDispatch/ConvexConcaveCollisionAlgorithm.cpp
extern/bullet/BulletDynamics/CollisionDispatch/ConvexConvexAlgorithm.cpp
extern/bullet/BulletDynamics/ConstraintSolver/ContactConstraint.cpp
extern/bullet/BulletDynamics/Dynamics/RigidBody.cpp
source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp

index 243efa961c9c9c9bd86ab86f088f3c61f6c8d63b..d6d1678c2946d9909cacc19e62eda2cc9daf4667 100644 (file)
@@ -346,9 +346,9 @@ elif sys.platform == 'win32':
        use_openal = 'true'
        use_fmod = 'false'
        use_quicktime = 'true'
-       use_sumo = 'false'
+       use_sumo = 'true'
        use_ode = 'false'
-       use_bullet = 'true'
+       use_bullet = 'false'
        use_buildinfo = 'true'
        build_blender_dynamic = 'true'
        build_blender_static = 'false'
index b0415c75d61956f28077ef681953d692729f6ae8..c430aedad7bf7f202bc4c98e5149884b1be4a19b 100644 (file)
@@ -19,7 +19,7 @@
 #include "ConstraintSolver/ConstraintSolver.h"
 #include "ConstraintSolver/ContactSolverInfo.h"
 #include "CollisionDispatch/ManifoldResult.h"
-#include "NarrowphaseCollision/RaycastCallback.h"
+#include "NarrowPhaseCollision/RaycastCallback.h"
 #include "CollisionShapes/TriangleMeshShape.h"
 
 
index 793c94804c04d4575af750a48268acf249818fad..1b4b9c61917afc1b19f42e4cffe67d39b739f3bd 100644 (file)
@@ -23,7 +23,7 @@
 
 #include "NarrowPhaseCollision/ConvexPenetrationDepthSolver.h"
 #include "NarrowPhaseCollision/ContinuousConvexCollision.h"
-#include "NarrowPhaseCollision/SubsimplexConvexCast.h"
+#include "NarrowPhaseCollision/SubSimplexConvexCast.h"
 #include "NarrowPhaseCollision/GjkConvexCast.h"
 
 
index 1bd9a39db976e40e3394bc81789697ea66803e41..10bb4af0a7d1dc3b08c31eaa4e50fa99273d15f3 100644 (file)
@@ -13,7 +13,7 @@
 #include "SimdVector3.h"
 #include "JacobianEntry.h"
 #include "ContactSolverInfo.h"
-#include "GEN_minmax.h"
+#include "GEN_MinMax.h"
 
 #define ASSERT2 assert
 
index a217291c756ed69b9013624d4708f454801c18d3..d3b105dc7f62af8c5dcffd556edd1461a3a0b6ef 100644 (file)
@@ -1,7 +1,7 @@
 #include "RigidBody.h"
 #include "MassProps.h"
 #include "CollisionShapes/ConvexShape.h"
-#include "GEN_minmax.h"
+#include "GEN_MinMax.h"
 #include <SimdTransformUtil.h>
 
 float gRigidBodyDamping = 0.5f;
index 5b6db434f8bbf51dcbcc7a1ccda10244fabf42ed..94ecfe27de258214050007260ef22c6dc7029267 100644 (file)
@@ -4,7 +4,7 @@
 #include <algorithm>
 #include "SimdTransform.h"
 #include "Dynamics/RigidBody.h"
-#include "BroadphaseCollision/BroadPhaseInterface.h"
+#include "BroadphaseCollision/BroadphaseInterface.h"
 #include "BroadphaseCollision/SimpleBroadphase.h"
 
 #include "CollisionShapes/ConvexShape.h"