From 671235b69be5714dc7ca338e5cc05b6ec64f36b4 Mon Sep 17 00:00:00 2001 From: Simon Clitherow Date: Tue, 2 Aug 2005 18:54:11 +0000 Subject: Finalised support for compiling BULLET on linux. 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. --- .../CollisionDispatch/ConvexConcaveCollisionAlgorithm.cpp | 2 +- .../bullet/BulletDynamics/CollisionDispatch/ConvexConvexAlgorithm.cpp | 2 +- extern/bullet/BulletDynamics/ConstraintSolver/ContactConstraint.cpp | 2 +- extern/bullet/BulletDynamics/Dynamics/RigidBody.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'extern') diff --git a/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConcaveCollisionAlgorithm.cpp b/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConcaveCollisionAlgorithm.cpp index b0415c75d61..c430aedad7b 100644 --- a/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConcaveCollisionAlgorithm.cpp +++ b/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConcaveCollisionAlgorithm.cpp @@ -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" diff --git a/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConvexAlgorithm.cpp b/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConvexAlgorithm.cpp index 793c94804c0..1b4b9c61917 100644 --- a/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConvexAlgorithm.cpp +++ b/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConvexAlgorithm.cpp @@ -23,7 +23,7 @@ #include "NarrowPhaseCollision/ConvexPenetrationDepthSolver.h" #include "NarrowPhaseCollision/ContinuousConvexCollision.h" -#include "NarrowPhaseCollision/SubsimplexConvexCast.h" +#include "NarrowPhaseCollision/SubSimplexConvexCast.h" #include "NarrowPhaseCollision/GjkConvexCast.h" diff --git a/extern/bullet/BulletDynamics/ConstraintSolver/ContactConstraint.cpp b/extern/bullet/BulletDynamics/ConstraintSolver/ContactConstraint.cpp index 1bd9a39db97..10bb4af0a7d 100644 --- a/extern/bullet/BulletDynamics/ConstraintSolver/ContactConstraint.cpp +++ b/extern/bullet/BulletDynamics/ConstraintSolver/ContactConstraint.cpp @@ -13,7 +13,7 @@ #include "SimdVector3.h" #include "JacobianEntry.h" #include "ContactSolverInfo.h" -#include "GEN_minmax.h" +#include "GEN_MinMax.h" #define ASSERT2 assert diff --git a/extern/bullet/BulletDynamics/Dynamics/RigidBody.cpp b/extern/bullet/BulletDynamics/Dynamics/RigidBody.cpp index a217291c756..d3b105dc7f6 100644 --- a/extern/bullet/BulletDynamics/Dynamics/RigidBody.cpp +++ b/extern/bullet/BulletDynamics/Dynamics/RigidBody.cpp @@ -1,7 +1,7 @@ #include "RigidBody.h" #include "MassProps.h" #include "CollisionShapes/ConvexShape.h" -#include "GEN_minmax.h" +#include "GEN_MinMax.h" #include float gRigidBodyDamping = 0.5f; -- cgit v1.2.3