diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-09-26 20:43:50 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-09-26 20:43:50 +0400 |
| commit | dff3d418d45b151a337110b0315bb3ef1bbf2df3 (patch) | |
| tree | f9224513816f4e8a773c7b844d658f882afebead /extern | |
| parent | f13bd6ef3ca908e1bec36e015c309225f18751e3 (diff) | |
Bullet build system fixes: add gimpact to the makefiles, and fix
blenderplayer linking for scons.
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/bullet2/src/Makefile | 2 | ||||
| -rw-r--r-- | extern/bullet2/src/SConscript | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/extern/bullet2/src/Makefile b/extern/bullet2/src/Makefile index 8bbada24b31..554179558d9 100644 --- a/extern/bullet2/src/Makefile +++ b/extern/bullet2/src/Makefile @@ -36,6 +36,7 @@ BulletCollision/BroadphaseCollision \ BulletCollision/CollisionShapes \ BulletCollision/NarrowPhaseCollision \ BulletCollision/CollisionDispatch \ +BulletCollision/Gimpact \ BulletDynamics/ConstraintSolver \ BulletDynamics/Vehicle \ BulletDynamics/Dynamics \ @@ -47,6 +48,7 @@ BulletCollision/BroadphaseCollision/*.cpp \ BulletCollision/CollisionShapes/*.cpp \ BulletCollision/NarrowPhaseCollision/*.cpp \ BulletCollision/CollisionDispatch/*.cpp \ +BulletCollision/Gimpact/*.cpp \ BulletDynamics/ConstraintSolver/*.cpp \ BulletDynamics/Vehicle/*.cpp \ BulletDynamics/Dynamics/*.cpp \ diff --git a/extern/bullet2/src/SConscript b/extern/bullet2/src/SConscript index 719eb44325e..203407569b1 100644 --- a/extern/bullet2/src/SConscript +++ b/extern/bullet2/src/SConscript @@ -37,7 +37,7 @@ incs = '. BulletCollision BulletDynamics LinearMath BulletSoftBody' env.BlenderLib ( libname = 'extern_bullet2linmath', sources=linearmath_src, includes=Split(incs), defines=Split(defs), libtype=['game2', 'player'], priority=[20, 170], compileflags=cflags ) env.BlenderLib ( libname = 'extern_bullet2dynamics', sources=bulletdyn_src, includes=Split(incs), defines=Split(defs), libtype=['game2', 'player'], priority=[19, 169], compileflags=cflags ) -env.BlenderLib ( libname = 'extern_bullet2collision_broadphase', sources=collision_broadphase_src, includes=Split(incs), defines=Split(defs), libtype=['game2', 'player'], priority=[25, 170], compileflags=cflags ) +env.BlenderLib ( libname = 'extern_bullet2collision_broadphase', sources=collision_broadphase_src, includes=Split(incs), defines=Split(defs), libtype=['game2', 'player'], priority=[25, 175], compileflags=cflags ) env.BlenderLib ( libname = 'extern_bullet2collision_dispatch', sources=collision_dispatch_src, includes=Split(incs), defines=Split(defs), libtype=['game2', 'player'], priority=[20, 170], compileflags=cflags ) env.BlenderLib ( libname = 'extern_bullet2collision_gimpact', sources=collision_gimpact_src, includes=Split(incs), defines=Split(defs), libtype=['game2', 'player'], priority=[20, 170], compileflags=cflags ) env.BlenderLib ( libname = 'extern_bullet2collision_shapes', sources=collision_shapes_src, includes=Split(incs), defines=Split(defs), libtype=['game2', 'player'], priority=[20, 170], compileflags=cflags ) |