diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2008-09-18 04:10:12 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2008-09-18 04:10:12 +0400 |
| commit | 7e6c1e1091b51dfdaad19ee4b8e1651b10e02057 (patch) | |
| tree | f0881d99aa4721c720326a20a8880e266631e8ab /extern/bullet2 | |
| parent | 067a890d823bb0181b1d028931004eba86fb9220 (diff) | |
needed these changes to get bullet building with cmake and linking with scons
Diffstat (limited to 'extern/bullet2')
| -rw-r--r-- | extern/bullet2/src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | extern/bullet2/src/SConscript | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/extern/bullet2/src/CMakeLists.txt b/extern/bullet2/src/CMakeLists.txt index 0ae1a7ab6ab..043fd3f6e7f 100644 --- a/extern/bullet2/src/CMakeLists.txt +++ b/extern/bullet2/src/CMakeLists.txt @@ -1 +1 @@ -SUBDIRS( BulletCollision BulletDynamics LinearMath ) +SUBDIRS( BulletCollision BulletDynamics LinearMath BulletSoftBody ) diff --git a/extern/bullet2/src/SConscript b/extern/bullet2/src/SConscript index b2ec67984d3..77d94bc8dab 100644 --- a/extern/bullet2/src/SConscript +++ b/extern/bullet2/src/SConscript @@ -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 ) |