From 208da2a5d0eaf2f64f7b73d0b24b619d7546bf8d Mon Sep 17 00:00:00 2001 From: Simon Clitherow Date: Mon, 1 Aug 2005 21:19:41 +0000 Subject: Added support for compiling BULLET with scons on windows using bandoler's patch as a basis (thanks!). A couple of notes: - This is for windows only, I did not have a chance to try linux yet. - SConscript for PHY_Bullet may need tweaking (plus support for other platforms), but at least it's in there :) Any problems, shout :) --- extern/SConscript | 3 ++- extern/bullet/SConscript | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'extern') diff --git a/extern/SConscript b/extern/SConscript index f5f4267988d..d11db23ab7a 100644 --- a/extern/SConscript +++ b/extern/SConscript @@ -5,7 +5,8 @@ Import('user_options_dict') print "externs..." SConscript(['qhull/SConscript', - 'solid/SConscript']) + 'solid/SConscript', + 'bullet/SConscript']) if user_options_dict['USE_INTERNATIONAL'] == 1: diff --git a/extern/bullet/SConscript b/extern/bullet/SConscript index b32d43c0705..ae3763d6e45 100644 --- a/extern/bullet/SConscript +++ b/extern/bullet/SConscript @@ -83,7 +83,7 @@ bullet_sources = ['Bullet/BroadphaseCollision/BroadphaseProxy.cpp', 'BulletDynamics/ConstraintSolver/ContactConstraint.cpp', 'BulletDynamics/ConstraintSolver/OdeConstraintSolver.cpp', - 'BulletDynamics/ConstraintSolver/OdeConstraintSolver2.cpp', + #'BulletDynamics/ConstraintSolver/OdeConstraintSolver2.cpp', 'BulletDynamics/ConstraintSolver/Point2PointConstraint.cpp', 'BulletDynamics/ConstraintSolver/SimpleConstraintSolver.cpp', 'BulletDynamics/ConstraintSolver/Solve2LinearConstraint.cpp', @@ -101,4 +101,4 @@ bullet_env.Append (CPPPATH = ['.', ]) source_files = bullet_sources -bullet_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/extern_bullet', source=source_files) +bullet_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/extern_bullet', source=bullet_sources) -- cgit v1.2.3