Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2008-09-26 20:43:50 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2008-09-26 20:43:50 +0400
commitdff3d418d45b151a337110b0315bb3ef1bbf2df3 (patch)
treef9224513816f4e8a773c7b844d658f882afebead /extern/bullet2/src/SConscript
parentf13bd6ef3ca908e1bec36e015c309225f18751e3 (diff)
Bullet build system fixes: add gimpact to the makefiles, and fix
blenderplayer linking for scons.
Diffstat (limited to 'extern/bullet2/src/SConscript')
-rw-r--r--extern/bullet2/src/SConscript2
1 files changed, 1 insertions, 1 deletions
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 )