diff options
| author | Erwin Coumans <blender@erwincoumans.com> | 2008-09-17 01:09:24 +0400 |
|---|---|---|
| committer | Erwin Coumans <blender@erwincoumans.com> | 2008-09-17 01:09:24 +0400 |
| commit | 0c77a178da71bcd5f8a83c1c951885320ba8a8d2 (patch) | |
| tree | 386ed73a7ba7f96009012953b63c9434f4a48b5b /extern/bullet2/src | |
| parent | 59414118391eb42d903b1a512374574bf3c34bb8 (diff) | |
add BulletSoftBody to SConscript and Makefile
Diffstat (limited to 'extern/bullet2/src')
| -rw-r--r-- | extern/bullet2/src/Makefile | 6 | ||||
| -rw-r--r-- | extern/bullet2/src/SConscript | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/extern/bullet2/src/Makefile b/extern/bullet2/src/Makefile index 24f3ca9767d..8bbada24b31 100644 --- a/extern/bullet2/src/Makefile +++ b/extern/bullet2/src/Makefile @@ -38,7 +38,8 @@ BulletCollision/NarrowPhaseCollision \ BulletCollision/CollisionDispatch \ BulletDynamics/ConstraintSolver \ BulletDynamics/Vehicle \ -BulletDynamics/Dynamics +BulletDynamics/Dynamics \ +BulletSoftBody CCSRCS = $(wildcard \ LinearMath/*.cpp \ @@ -48,7 +49,8 @@ BulletCollision/NarrowPhaseCollision/*.cpp \ BulletCollision/CollisionDispatch/*.cpp \ BulletDynamics/ConstraintSolver/*.cpp \ BulletDynamics/Vehicle/*.cpp \ -BulletDynamics/Dynamics/*.cpp) +BulletDynamics/Dynamics/*.cpp \ +BulletSoftBody/*.cpp) CPPFLAGS += -D_LIB -I. -IBulletCollision -IBulletDynamics -ILinearMath diff --git a/extern/bullet2/src/SConscript b/extern/bullet2/src/SConscript index 59b823982f5..c2980a0d737 100644 --- a/extern/bullet2/src/SConscript +++ b/extern/bullet2/src/SConscript @@ -23,7 +23,7 @@ elif sys.platform=='darwin': linearmath_src = env.Glob("LinearMath/*.cpp") -bulletdyn_src = env.Glob("BulletDynamics/Vehicle/*.cpp") + env.Glob("BulletDynamics/ConstraintSolver/*.cpp") + env.Glob("BulletDynamics/Dynamics/*.cpp") +bulletdyn_src = env.Glob("BulletSoftBody/*.cpp") + 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") collision_src += env.Glob("BulletCollision/CollisionShapes/*.cpp") + env.Glob("BulletCollision/NarrowPhaseCollision/*.cpp") |