Bullet build system fixes: add gimpact to the makefiles, and fix
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Fri, 26 Sep 2008 16:43:50 +0000 (16:43 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Fri, 26 Sep 2008 16:43:50 +0000 (16:43 +0000)
blenderplayer linking for scons.

extern/bullet2/src/Makefile
extern/bullet2/src/SConscript

index 8bbada24b31e1d54918e6604c485f31149efd2ba..554179558d93cd3b01faa75640bf40e51295088c 100644 (file)
@@ -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 \
index 719eb44325ed19bbda79b4e1807ef33837f0f71e..203407569b181e29b03101f45685b53090e5ffff 100644 (file)
@@ -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 )