diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-06-06 03:27:49 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-06-06 03:27:49 +0400 |
commit | 2ebb1c63f7b26478ed4c85d572312adf562b3148 (patch) | |
tree | 1765ff232652cc9eda3b2df3157db0ca2033b1c8 /source/blender/editors/sound | |
parent | 4da179749eb8d6b53f5c2eba4b3e4132656c3d4f (diff) |
finish cleanup to cmake editors, also removed some stuff from scons thats not needed.
Diffstat (limited to 'source/blender/editors/sound')
-rw-r--r-- | source/blender/editors/sound/CMakeLists.txt | 88 | ||||
-rw-r--r-- | source/blender/editors/sound/SConscript | 2 |
2 files changed, 7 insertions, 83 deletions
diff --git a/source/blender/editors/sound/CMakeLists.txt b/source/blender/editors/sound/CMakeLists.txt index 525f67fdc11..02765726c6e 100644 --- a/source/blender/editors/sound/CMakeLists.txt +++ b/source/blender/editors/sound/CMakeLists.txt @@ -15,11 +15,6 @@ # along with this program; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # -# The Original Code is Copyright (C) 2006, Blender Foundation -# All rights reserved. -# -# The Original Code is: all of this file. -# # Contributor(s): Jacques Beaurain. # # ***** END GPL LICENSE BLOCK ***** @@ -27,85 +22,14 @@ FILE(GLOB SRC *.c) SET(INC - ../../windowmanager - ../../editors/include - ../../editors/interface + ../../blenkernel + ../../blenlib + ../include ../../../../intern/guardedalloc - ../../../../intern/memutil - ../../blenlib ../../makesdna - ../../makesrna ../../blenkernel - ../../include ../../imbuf - ../../render/extern/include - ../../../../intern/bsp/extern - ../../../../intern/decimation/extern - ../../blenloader - ../../python - ../../../kernel/gen_system - ../../readstreamglue - ../../../../intern/elbeem/extern - ../../../../intern/ghost - ../../../../intern/opennl/extern - ../../../../extern/glew/include - ../../../../intern/smoke/extern ../../../../intern/audaspace/intern - ../../nodes - ../../gpu - ../../blenfont - ../../ikplugin + ../../makesdna + ../../makesrna + ../../windowmanager ) -ADD_DEFINITIONS(-DGLEW_STATIC) - -IF(WITH_GAMEENGINE) - ADD_DEFINITIONS(-DGAMEBLENDER) -ENDIF(WITH_GAMEENGINE) - -IF(WITH_INTERNATIONAL) - ADD_DEFINITIONS(-DINTERNATIONAL) -ENDIF(WITH_INTERNATIONAL) - -IF(WITH_OPENEXR) - ADD_DEFINITIONS(-DWITH_OPENEXR) -ENDIF(WITH_OPENEXR) - -IF(WITH_TIFF) - ADD_DEFINITIONS(-DWITH_TIFF) -ENDIF(WITH_TIFF) - -IF(WITH_OPENJPEG) - ADD_DEFINITIONS(-DWITH_OPENJPEG) -ENDIF(WITH_OPENJPEG) - -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_OPENMP) - ADD_DEFINITIONS(-DPARALLEL=1) -ENDIF(WITH_OPENMP) - -IF(NOT WITH_ELBEEM) - ADD_DEFINITIONS(-DDISABLE_ELBEEM) -ENDIF(NOT WITH_ELBEEM) - -IF(WITH_PYTHON) - SET(INC ${INC} ${PYTHON_INC}) -ELSE(WITH_PYTHON) - ADD_DEFINITIONS(-DDISABLE_PYTHON) -ENDIF(WITH_PYTHON) - -IF(WIN32) - SET(INC ${INC} ${PTHREADS_INC}) -ENDIF(WIN32) - -IF(WITH_BUILDINFO) - ADD_DEFINITIONS(-DNAN_BUILDINFO) -ENDIF(WITH_BUILDINFO) - BLENDERLIB(bf_editor_sound "${SRC}" "${INC}") diff --git a/source/blender/editors/sound/SConscript b/source/blender/editors/sound/SConscript index 9d2cd2b7cf5..8010dd49c57 100644 --- a/source/blender/editors/sound/SConscript +++ b/source/blender/editors/sound/SConscript @@ -5,7 +5,7 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc' -incs += ' ../../makesrna ../../python' +incs += ' ../../makesrna' incs += ' #/intern/audaspace/intern' defs = [] |