Revision: 16747
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16747
Author: blendix
Date: 2008-09-26 18:43:50 +0200 (Fri, 26 Sep 2008)
Log Message:
-----------
Bullet build system fixes: add gimpact to the makefiles, and fix
blenderplayer linking for scons.
Modified Paths:
--------------
trunk/blender/extern/bullet2/src/Makefile
trunk/blender/extern/bullet2/src/SConscript
Modified: trunk/blender/extern/bullet2/src/Makefile
===================================================================
--- trunk/blender/extern/bullet2/src/Makefile 2008-09-26 16:14:35 UTC (rev
16746)
+++ trunk/blender/extern/bullet2/src/Makefile 2008-09-26 16:43:50 UTC (rev
16747)
@@ -36,6 +36,7 @@
BulletCollision/CollisionShapes \
BulletCollision/NarrowPhaseCollision \
BulletCollision/CollisionDispatch \
+BulletCollision/Gimpact \
BulletDynamics/ConstraintSolver \
BulletDynamics/Vehicle \
BulletDynamics/Dynamics \
@@ -47,6 +48,7 @@
BulletCollision/CollisionShapes/*.cpp \
BulletCollision/NarrowPhaseCollision/*.cpp \
BulletCollision/CollisionDispatch/*.cpp \
+BulletCollision/Gimpact/*.cpp \
BulletDynamics/ConstraintSolver/*.cpp \
BulletDynamics/Vehicle/*.cpp \
BulletDynamics/Dynamics/*.cpp \
Modified: trunk/blender/extern/bullet2/src/SConscript
===================================================================
--- trunk/blender/extern/bullet2/src/SConscript 2008-09-26 16:14:35 UTC (rev
16746)
+++ trunk/blender/extern/bullet2/src/SConscript 2008-09-26 16:43:50 UTC (rev
16747)
@@ -37,7 +37,7 @@
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 )
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
