remove unused defines, cant check every case but from grepping the souece it should...
authorCampbell Barton <ideasman42@gmail.com>
Mon, 5 Oct 2009 07:08:59 +0000 (07:08 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 5 Oct 2009 07:08:59 +0000 (07:08 +0000)
extern/bullet2/CMakeLists.txt
extern/bullet2/src/SConscript
source/blender/nodes/CMakeLists.txt
source/blender/nodes/SConscript
source/blender/python/CMakeLists.txt
source/blender/render/CMakeLists.txt
source/blender/render/SConscript

index 2e2d892078147e7a9e9040c22adf14213b942fd7..3054ed989087420126fc23972195793f4c1e5aed 100644 (file)
@@ -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 )
+
index 3d0c645e7a04411d9e7cd3a194b356501dfbbada..c0ee56045d815c043f189f1d6fab2bf2af4d640d 100644 (file)
@@ -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':
index 58bee7e3acfe80d13650bf58d36038cbfe333378..ee4b9a81ccdce8c0dc343046ef28a665e9280c8f 100644 (file)
@@ -38,20 +38,6 @@ IF(WIN32)
        SET(INC ${INC} ${PTHREADS_INC})
 ENDIF(WIN32)
 
-IF(WITH_OPENEXR)
-       ADD_DEFINITIONS(-DWITH_OPENEXR)
-ENDIF(WITH_OPENEXR)
-
-IF(WITH_QUICKTIME)
-       SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
-       ADD_DEFINITIONS(-DWITH_QUICKTIME)
-ENDIF(WITH_QUICKTIME)
-
-IF(WITH_FFMPEG)
-       SET(INC ${INC} ${FFMPEG_INC})
-       ADD_DEFINITIONS(-DWITH_FFMPEG)
-ENDIF(WITH_FFMPEG)
-
 IF(WITH_PYTHON)
        SET(INC ${INC} ../python ${PYTHON_INC})
 ELSE(WITH_PYTHON)
index 01319dc1eb4b9a644c5226bb3b6c0cea36104e4b..548f49735745813674d0240ec0746937f8955f74 100644 (file)
@@ -27,17 +27,6 @@ if env['WITH_BF_PYTHON']:
 else:
        defs.append('DISABLE_PYTHON')
 
-if env['WITH_BF_OPENEXR']:
-       defs.append('WITH_OPENEXR')
-
-if env['WITH_BF_FFMPEG']:
-       defs.append('WITH_FFMPEG')
-       incs += ' ' + env['BF_FFMPEG_INC']
-
-if env['WITH_BF_QUICKTIME']:
-       defs.append('WITH_QUICKTIME')
-       incs += ' ' + env['BF_QUICKTIME_INC']
-
 if env['OURPLATFORM'] == 'linux2':
        cflags='-pthread'
        incs += ' ../../../extern/binreloc/include'
index 7abec566505f3b62ef0dc064f9090771e0542677..a83e29e2fab78696767822d0f6bf11299cc1dda7 100644 (file)
@@ -46,8 +46,6 @@ IF(WITH_FFMPEG)
        ADD_DEFINITIONS(-DWITH_FFMPEG)
 ENDIF(WITH_FFMPEG)
 
-ADD_DEFINITIONS(-DWITH_CCGSUBSURF)
-
 BLENDERLIB(bf_python "${SRC}" "${INC}")
 BLENDERLIB(bf_gen_python "${GENSRC}" "${INC}")
 
index b30bc4936a52fb6e5546cc357586b612f936cdf2..29539fa4d1788494b295da927ce25703db3df830 100644 (file)
@@ -47,10 +47,6 @@ IF(WITH_QUICKTIME)
        ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
-IF(WITH_FFMPEG)
-       ADD_DEFINITIONS(-DWITH_FFMPEG)
-ENDIF(WITH_FFMPEG)
-
 #TODO
 #if env['OURPLATFORM']=='linux2':
 #    cflags='-pthread'
index f6193c29eba78d066e5e4e8e102663cca75ddc38..9b2480cc43780be1da5c069ceb6e34898206f34d 100644 (file)
@@ -14,9 +14,6 @@ if env['WITH_BF_QUICKTIME']:
     defs.append('WITH_QUICKTIME')
     incs += ' ../quicktime ' + env['BF_QUICKTIME_INC']
 
-if env['WITH_BF_FFMPEG']:
-    defs.append('WITH_FFMPEG')
-
 if env['WITH_BF_OPENEXR']:
     defs.append('WITH_OPENEXR')