diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-10-05 11:08:59 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-10-05 11:08:59 +0400 |
| commit | 0f07bea06bcaaa9db9568c9b28bd00da18e5f56f (patch) | |
| tree | 324bdc5ba796383e7e531d9994128f4d47ae5177 /extern | |
| parent | af522abf33bd3b8caf61f596d1e0a35285e45f9a (diff) | |
remove unused defines, cant check every case but from grepping the souece it should go ok.
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/bullet2/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | extern/bullet2/src/SConscript | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/extern/bullet2/CMakeLists.txt b/extern/bullet2/CMakeLists.txt index 2e2d8920781..3054ed98908 100644 --- a/extern/bullet2/CMakeLists.txt +++ b/extern/bullet2/CMakeLists.txt @@ -32,14 +32,12 @@ FILE(GLOB SRC src/BulletCollision/CollisionShapes/*.cpp src/BulletCollision/NarrowPhaseCollision/*.cpp src/BulletCollision/Gimpact/*.cpp - src/BulletCollision//CollisionDispatch/*.cpp + src/BulletCollision/CollisionDispatch/*.cpp src/BulletDynamics/ConstraintSolver/*.cpp src/BulletDynamics/Vehicle/*.cpp src/BulletDynamics/Dynamics/*.cpp src/BulletSoftBody/*.cpp ) -ADD_DEFINITIONS(-D_LIB) - BLENDERLIB(extern_bullet "${SRC}" "${INC}") -#, libtype=['game2', 'player'], priority=[20, 170], compileflags=cflags ) + diff --git a/extern/bullet2/src/SConscript b/extern/bullet2/src/SConscript index 3d0c645e7a0..c0ee56045d8 100644 --- a/extern/bullet2/src/SConscript +++ b/extern/bullet2/src/SConscript @@ -4,11 +4,11 @@ import os Import('env') -defs = 'USE_DOUBLES QHULL _LIB' +defs = '' cflags = [] if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): - defs += ' WIN32 NDEBUG _WINDOWS _LIB' + defs += ' WIN32 NDEBUG _WINDOWS' #cflags += ['/MT', '/W3', '/GX', '/O2', '/Op'] cflags += ['/MT', '/W3', '/GX', '/Og', '/Ot', '/Ob1', '/Op', '/G6', '/O3', '/EHcs'] elif env['OURPLATFORM']=='win32-mingw': |