diff options
| author | Simon Clitherow <aphex@nildram.co.uk> | 2005-08-02 22:54:11 +0400 |
|---|---|---|
| committer | Simon Clitherow <aphex@nildram.co.uk> | 2005-08-02 22:54:11 +0400 |
| commit | 671235b69be5714dc7ca338e5cc05b6ec64f36b4 (patch) | |
| tree | 6a3d6dfc9f45ccd77353df9e6dc8230592623233 /extern | |
| parent | 280e97604479d6d96cfd238a9d6848927e39771b (diff) | |
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.
Diffstat (limited to 'extern')
4 files changed, 4 insertions, 4 deletions
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 <SimdTransformUtil.h> float gRigidBodyDamping = 0.5f; |