[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23630] trunk/blender: remove unused defines, cant check every case but from grepping the souece it should go ok.

[Campbell Barton]

Revision: 23630
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23630
Author:   campbellbarton
Date:     2009-10-05 09:08:59 +0200 (Mon, 05 Oct 2009)

Log Message:
-----------
remove unused defines, cant check every case but from grepping the souece it should go ok.

Modified Paths:
--------------
    trunk/blender/extern/bullet2/CMakeLists.txt
    trunk/blender/extern/bullet2/src/SConscript
    trunk/blender/source/blender/nodes/CMakeLists.txt
    trunk/blender/source/blender/nodes/SConscript
    trunk/blender/source/blender/python/CMakeLists.txt
    trunk/blender/source/blender/render/CMakeLists.txt
    trunk/blender/source/blender/render/SConscript

Modified: trunk/blender/extern/bullet2/CMakeLists.txt
===================================================================
--- trunk/blender/extern/bullet2/CMakeLists.txt	2009-10-05 02:59:47 UTC (rev 23629)
+++ trunk/blender/extern/bullet2/CMakeLists.txt	2009-10-05 07:08:59 UTC (rev 23630)
@@ -32,14 +32,12 @@
 	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 )
+

Modified: trunk/blender/extern/bullet2/src/SConscript
===================================================================
--- trunk/blender/extern/bullet2/src/SConscript	2009-10-05 02:59:47 UTC (rev 23629)
+++ trunk/blender/extern/bullet2/src/SConscript	2009-10-05 07:08:59 UTC (rev 23630)
@@ -4,11 +4,11 @@
 
 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':

Modified: trunk/blender/source/blender/nodes/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/nodes/CMakeLists.txt	2009-10-05 02:59:47 UTC (rev 23629)
+++ trunk/blender/source/blender/nodes/CMakeLists.txt	2009-10-05 07:08:59 UTC (rev 23630)
@@ -38,20 +38,6 @@
 	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)

Modified: trunk/blender/source/blender/nodes/SConscript
===================================================================
--- trunk/blender/source/blender/nodes/SConscript	2009-10-05 02:59:47 UTC (rev 23629)
+++ trunk/blender/source/blender/nodes/SConscript	2009-10-05 07:08:59 UTC (rev 23630)
@@ -27,17 +27,6 @@
 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'

Modified: trunk/blender/source/blender/python/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/python/CMakeLists.txt	2009-10-05 02:59:47 UTC (rev 23629)
+++ trunk/blender/source/blender/python/CMakeLists.txt	2009-10-05 07:08:59 UTC (rev 23630)
@@ -46,8 +46,6 @@
 	ADD_DEFINITIONS(-DWITH_FFMPEG)
 ENDIF(WITH_FFMPEG)
 
-ADD_DEFINITIONS(-DWITH_CCGSUBSURF)
-
 BLENDERLIB(bf_python "${SRC}" "${INC}")
 BLENDERLIB(bf_gen_python "${GENSRC}" "${INC}")
 

Modified: trunk/blender/source/blender/render/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/render/CMakeLists.txt	2009-10-05 02:59:47 UTC (rev 23629)
+++ trunk/blender/source/blender/render/CMakeLists.txt	2009-10-05 07:08:59 UTC (rev 23630)
@@ -47,10 +47,6 @@
 	ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
-IF(WITH_FFMPEG)
-	ADD_DEFINITIONS(-DWITH_FFMPEG)
-ENDIF(WITH_FFMPEG)
-
 #TODO
 #if env['OURPLATFORM']=='linux2':
 #    cflags='-pthread'

Modified: trunk/blender/source/blender/render/SConscript
===================================================================
--- trunk/blender/source/blender/render/SConscript	2009-10-05 02:59:47 UTC (rev 23629)
+++ trunk/blender/source/blender/render/SConscript	2009-10-05 07:08:59 UTC (rev 23630)
@@ -14,9 +14,6 @@
     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')