diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-01-24 15:28:26 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-01-24 15:28:26 +0400 |
| commit | 66bf63d7af52762a81876adc2907c4fc414716f9 (patch) | |
| tree | 65e0639779af2bcf41518d142d32befd980a7c80 /source/blender/rigidbody | |
| parent | 9592cade86b8ca15b72584f038508278434f8d89 (diff) | |
use inline functions for subsurf MVert,MEdge mesh array functions, also some include cleanup for scons/cmake.
Diffstat (limited to 'source/blender/rigidbody')
| -rw-r--r-- | source/blender/rigidbody/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | source/blender/rigidbody/SConscript | 12 | ||||
| -rw-r--r-- | source/blender/rigidbody/rb_bullet_api.cpp | 2 |
3 files changed, 8 insertions, 7 deletions
diff --git a/source/blender/rigidbody/CMakeLists.txt b/source/blender/rigidbody/CMakeLists.txt index cf91cd6638c..903fbe66f01 100644 --- a/source/blender/rigidbody/CMakeLists.txt +++ b/source/blender/rigidbody/CMakeLists.txt @@ -23,7 +23,6 @@ SET(INC . - ../blenlib ../../../extern/bullet2/src ) diff --git a/source/blender/rigidbody/SConscript b/source/blender/rigidbody/SConscript index bddc9f2bab2..14c80304983 100644 --- a/source/blender/rigidbody/SConscript +++ b/source/blender/rigidbody/SConscript @@ -25,14 +25,18 @@ # # ***** END GPL LICENSE BLOCK ***** -Import ('env') +Import('env') # XXX: we need a contingency plan for when not compiling with Bullet, # since this module will always get included... # This problem will also apply to other engines at a later date too... sources = env.Glob('*.cpp') -incs = '../blenlib ../../../intern/guardedalloc ../../../extern/bullet2/src' - -env.BlenderLib ('bf_rigidbody', sources, Split(incs), [], libtype=['core', 'player'], priority=[180, 30] ) +incs = [ + '.', + '../../../extern/bullet2/src', + ] +env.BlenderLib('bf_rigidbody', sources=sources, + includes=incs, defines=[], + libtype=['core', 'player'], priority=[180, 30]) diff --git a/source/blender/rigidbody/rb_bullet_api.cpp b/source/blender/rigidbody/rb_bullet_api.cpp index c7955cae4f3..c4a4532bad1 100644 --- a/source/blender/rigidbody/rb_bullet_api.cpp +++ b/source/blender/rigidbody/rb_bullet_api.cpp @@ -60,8 +60,6 @@ subject to the following restrictions: #include "RBI_api.h" -#include "BLI_math.h" - #include "btBulletDynamicsCommon.h" #include "LinearMath/btVector3.h" |