Revision: 16740
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16740
Author: jesterking
Date: 2008-09-26 10:05:18 +0200 (Fri, 26 Sep 2008)
Log Message:
-----------
* split collision lib into its subparts
-This is to remedy long command-line troubles for scons/mingw users.
Hopefully this goes ok on other platforms too :)
Modified Paths:
--------------
trunk/blender/extern/bullet2/src/SConscript
Modified: trunk/blender/extern/bullet2/src/SConscript
===================================================================
--- trunk/blender/extern/bullet2/src/SConscript 2008-09-26 07:12:36 UTC (rev
16739)
+++ trunk/blender/extern/bullet2/src/SConscript 2008-09-26 08:05:18 UTC (rev
16740)
@@ -25,8 +25,11 @@
bulletdyn_src = env.Glob("BulletDynamics/Vehicle/*.cpp") +
env.Glob("BulletDynamics/ConstraintSolver/*.cpp") +
env.Glob("BulletDynamics/Dynamics/*.cpp")
-collision_src = env.Glob("BulletCollision/BroadphaseCollision/*.cpp") +
env.Glob("BulletCollision/CollisionDispatch/*.cpp") +
env.Glob("BulletCollision/Gimpact/*.cpp")
-collision_src += env.Glob("BulletCollision/CollisionShapes/*.cpp") +
env.Glob("BulletCollision/NarrowPhaseCollision/*.cpp")
+collision_broadphase_src =
env.Glob("BulletCollision/BroadphaseCollision/*.cpp")
+collision_dispatch_src = env.Glob("BulletCollision/CollisionDispatch/*.cpp")
+collision_gimpact_src = env.Glob("BulletCollision/Gimpact/*.cpp")
+collision_shapes_src = env.Glob("BulletCollision/CollisionShapes/*.cpp")
+collision_narrowphase_src =
env.Glob("BulletCollision/NarrowPhaseCollision/*.cpp")
softbody_src = env.Glob("BulletSoftBody/*.cpp")
@@ -34,5 +37,9 @@
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', sources=collision_src,
includes=Split(incs), defines=Split(defs), libtype=['game2', 'player'],
priority=[20, 170], compileflags=cflags )
+env.BlenderLib ( libname = 'extern_bullet2collision_broadphase',
sources=collision_broadphase_src, includes=Split(incs), defines=Split(defs),
libtype=['game2', 'player'], priority=[20, 170], 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 )
+env.BlenderLib ( libname = 'extern_bullet2collision_narrowphase',
sources=collision_narrowphase_src, includes=Split(incs), defines=Split(defs),
libtype=['game2', 'player'], priority=[20, 170], compileflags=cflags )
env.BlenderLib ( libname = 'extern_bullet2softbody', sources=softbody_src,
includes=Split(incs), defines=Split(defs), libtype=['game2', 'player'],
priority=[18,168], compileflags=cflags )
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
