needed these changes to get bullet building with cmake and linking with scons
authorCampbell Barton <ideasman42@gmail.com>
Thu, 18 Sep 2008 00:10:12 +0000 (00:10 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 18 Sep 2008 00:10:12 +0000 (00:10 +0000)
extern/bullet2/src/CMakeLists.txt
extern/bullet2/src/SConscript

index 0ae1a7ab6abcca6f240d679ed974269ee824a253..043fd3f6e7f566531f4b352ee1a21ffa5548a2b3 100644 (file)
@@ -1 +1 @@
-SUBDIRS( BulletCollision BulletDynamics LinearMath )
+SUBDIRS( BulletCollision BulletDynamics LinearMath BulletSoftBody )
index b2ec67984d3501b6c53fb3a45396afa73bf2934a..77d94bc8dab28d2c2f7a5f68c7a3593c0222746d 100644 (file)
@@ -35,4 +35,4 @@ 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', 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 )