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 /source | |
parent | af522abf33bd3b8caf61f596d1e0a35285e45f9a (diff) |
remove unused defines, cant check every case but from grepping the souece it should go ok.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/nodes/CMakeLists.txt | 14 | ||||
-rw-r--r-- | source/blender/nodes/SConscript | 11 | ||||
-rw-r--r-- | source/blender/python/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/render/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/render/SConscript | 3 |
5 files changed, 0 insertions, 34 deletions
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt index 58bee7e3acf..ee4b9a81ccd 100644 --- a/source/blender/nodes/CMakeLists.txt +++ b/source/blender/nodes/CMakeLists.txt @@ -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) diff --git a/source/blender/nodes/SConscript b/source/blender/nodes/SConscript index 01319dc1eb4..548f4973574 100644 --- a/source/blender/nodes/SConscript +++ b/source/blender/nodes/SConscript @@ -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' diff --git a/source/blender/python/CMakeLists.txt b/source/blender/python/CMakeLists.txt index 7abec566505..a83e29e2fab 100644 --- a/source/blender/python/CMakeLists.txt +++ b/source/blender/python/CMakeLists.txt @@ -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}") diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt index b30bc4936a5..29539fa4d17 100644 --- a/source/blender/render/CMakeLists.txt +++ b/source/blender/render/CMakeLists.txt @@ -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' diff --git a/source/blender/render/SConscript b/source/blender/render/SConscript index f6193c29eba..9b2480cc437 100644 --- a/source/blender/render/SConscript +++ b/source/blender/render/SConscript @@ -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') |