[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16587] trunk/blender/extern/bullet2/src: needed these changes to get bullet building with cmake and linking with scons

[Campbell Barton]

Revision: 16587
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16587
Author:   campbellbarton
Date:     2008-09-18 02:10:12 +0200 (Thu, 18 Sep 2008)

Log Message:
-----------
needed these changes to get bullet building with cmake and linking with scons

Modified Paths:
--------------
    trunk/blender/extern/bullet2/src/CMakeLists.txt
    trunk/blender/extern/bullet2/src/SConscript

Modified: trunk/blender/extern/bullet2/src/CMakeLists.txt
===================================================================
--- trunk/blender/extern/bullet2/src/CMakeLists.txt	2008-09-17 21:47:05 UTC (rev 16586)
+++ trunk/blender/extern/bullet2/src/CMakeLists.txt	2008-09-18 00:10:12 UTC (rev 16587)
@@ -1 +1 @@
-SUBDIRS( BulletCollision BulletDynamics LinearMath )
+SUBDIRS( BulletCollision BulletDynamics LinearMath BulletSoftBody )

Modified: trunk/blender/extern/bullet2/src/SConscript
===================================================================
--- trunk/blender/extern/bullet2/src/SConscript	2008-09-17 21:47:05 UTC (rev 16586)
+++ trunk/blender/extern/bullet2/src/SConscript	2008-09-18 00:10:12 UTC (rev 16587)
@@ -35,4 +35,4 @@
 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_bullet2softbody', sources=softbody_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 )