griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Bullet build system fixes: add gimpact to the makefiles, and fix

Browse Source 
blenderplayer linking for scons.
This commit is contained in:
Brecht Van Lommel
2008-09-26 16:43:50 +00:00
parent f13bd6ef3c
commit dff3d418d4
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extern/bullet2/src/Makefile vendored
View 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 \

2
extern/bullet2/src/SConscript vendored
View 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 )