Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/extern
diff options
context:
space:
mode:
Diffstat (limited to 'extern')
-rw-r--r--extern/SConscript3
-rw-r--r--extern/bullet/SConscript4
2 files changed, 4 insertions, 3 deletions
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)