diff options
Diffstat (limited to 'source')
20 files changed, 129 insertions, 1389 deletions
diff --git a/source/blender/editors/space_file/CMakeLists.txt b/source/blender/editors/space_file/CMakeLists.txt index 21eb49c795c..338d30c8f5a 100644 --- a/source/blender/editors/space_file/CMakeLists.txt +++ b/source/blender/editors/space_file/CMakeLists.txt @@ -27,43 +27,20 @@ FILE(GLOB SRC *.c) SET(INC - ../../windowmanager - ../../editors/include - ../../editors/interface - ../../../../intern/guardedalloc - ../../../../intern/memutil - ../../blenlib ../../makesdna - ../../makesrna ../../blenkernel - ../../include ../../imbuf - ../../render/extern/include - ../../../../intern/bsp/extern - ../../../../intern/decimation/extern + ../../blenfont + ../../blenkernel + ../../blenlib ../../blenloader - ../../python - ../../../kernel/gen_system - ../../readstreamglue - ../../../../intern/elbeem/extern - ../../../../intern/ghost - ../../../../intern/opennl/extern - ../../../../extern/glew/include - ../../../../intern/smoke/extern + ../../imbuf + ../include ../../../../intern/audaspace/intern - ../../nodes - ../../gpu - ../../blenfont - ../../ikplugin + ../../../../intern/guardedalloc + ../../makesdna + ../../makesrna + ../../render/extern/include + ../../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) @@ -76,36 +53,8 @@ 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) +IF(WITH_DDS) + ADD_DEFINITIONS(-DWITH_DDS) +ENDIF(WITH_DDS) BLENDERLIB(bf_editor_space_file "${SRC}" "${INC}") diff --git a/source/blender/editors/space_graph/CMakeLists.txt b/source/blender/editors/space_graph/CMakeLists.txt index 9d743ec1aad..d0e5e74f257 100644 --- a/source/blender/editors/space_graph/CMakeLists.txt +++ b/source/blender/editors/space_graph/CMakeLists.txt @@ -27,85 +27,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 + ../../makesdna + ../../makesrna + ../../windowmanager ../../../../intern/audaspace/intern - ../../nodes - ../../gpu - ../../blenfont - ../../ikplugin ) -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_space_graph "${SRC}" "${INC}") diff --git a/source/blender/editors/space_image/CMakeLists.txt b/source/blender/editors/space_image/CMakeLists.txt index 0947fa6f9bb..7fd3079f92f 100644 --- a/source/blender/editors/space_image/CMakeLists.txt +++ b/source/blender/editors/space_image/CMakeLists.txt @@ -27,43 +27,17 @@ FILE(GLOB SRC *.c) SET(INC - ../../windowmanager - ../../editors/include - ../../editors/interface + ../../blenkernel + ../../blenlib + ../../imbuf + ../include ../../../../intern/guardedalloc - ../../../../intern/memutil - ../../blenlib ../../makesdna - ../../makesrna ../../blenkernel - ../../include ../../imbuf + ../../makesdna + ../../makesrna ../../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 + ../../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) @@ -72,40 +46,8 @@ 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_space_image "${SRC}" "${INC}") diff --git a/source/blender/editors/space_info/CMakeLists.txt b/source/blender/editors/space_info/CMakeLists.txt index ccdf6dfd1ca..aa9a40ac98f 100644 --- a/source/blender/editors/space_info/CMakeLists.txt +++ b/source/blender/editors/space_info/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 + ../../imbuf + ../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_space_info "${SRC}" "${INC}") diff --git a/source/blender/editors/space_info/SConscript b/source/blender/editors/space_info/SConscript index 01268115687..417b9c7d962 100644 --- a/source/blender/editors/space_info/SConscript +++ b/source/blender/editors/space_info/SConscript @@ -8,7 +8,4 @@ incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' defs = [] -if env['WITH_BF_GAMEENGINE']: - defs.append('GAMEBLENDER=1') - env.BlenderLib ( 'bf_editors_space_info', sources, Split(incs), defs, libtype=['core'], priority=[70] ) diff --git a/source/blender/editors/space_logic/CMakeLists.txt b/source/blender/editors/space_logic/CMakeLists.txt index 5c3902d141c..d559a5c6f17 100644 --- a/source/blender/editors/space_logic/CMakeLists.txt +++ b/source/blender/editors/space_logic/CMakeLists.txt @@ -27,85 +27,18 @@ FILE(GLOB SRC *.c) SET(INC + ../../blenkernel + ../../blenlib + ../include + ../../../../intern/guardedalloc + ../../makesdna + ../../makesrna ../../windowmanager - ../../editors/include ../../editors/interface - ../../../../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 ) -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_space_logic "${SRC}" "${INC}") diff --git a/source/blender/editors/space_nla/CMakeLists.txt b/source/blender/editors/space_nla/CMakeLists.txt index 0e4166a9e1e..67b39b1589b 100644 --- a/source/blender/editors/space_nla/CMakeLists.txt +++ b/source/blender/editors/space_nla/CMakeLists.txt @@ -27,85 +27,13 @@ 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_space_nla "${SRC}" "${INC}") diff --git a/source/blender/editors/space_node/CMakeLists.txt b/source/blender/editors/space_node/CMakeLists.txt index fd1dbfbe60d..0c8f9fc1ee2 100644 --- a/source/blender/editors/space_node/CMakeLists.txt +++ b/source/blender/editors/space_node/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,21 @@ FILE(GLOB SRC *.c) SET(INC - ../../windowmanager - ../../editors/include - ../../editors/interface + ../../blenkernel + ../../blenlib + ../../imbuf + ../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 + ../../makesdna + ../../makesrna ../../nodes - ../../gpu - ../../blenfont - ../../ikplugin + ../../render/extern/include + ../../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_space_node "${SRC}" "${INC}") diff --git a/source/blender/editors/space_outliner/CMakeLists.txt b/source/blender/editors/space_outliner/CMakeLists.txt index fd1e1b2b8c9..8be645cb324 100644 --- a/source/blender/editors/space_outliner/CMakeLists.txt +++ b/source/blender/editors/space_outliner/CMakeLists.txt @@ -27,85 +27,15 @@ FILE(GLOB SRC *.c) SET(INC - ../../windowmanager - ../../editors/include - ../../editors/interface + ../../blenkernel + ../../blenlib + ../../imbuf + ../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_space_outliner "${SRC}" "${INC}") diff --git a/source/blender/editors/space_script/CMakeLists.txt b/source/blender/editors/space_script/CMakeLists.txt index ef39dc12f21..6d93c17fc77 100644 --- a/source/blender/editors/space_script/CMakeLists.txt +++ b/source/blender/editors/space_script/CMakeLists.txt @@ -27,85 +27,19 @@ 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}) + SET(INC ${INC} ${PYTHON_INC} ../../python) 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_space_script "${SRC}" "${INC}") diff --git a/source/blender/editors/space_sequencer/CMakeLists.txt b/source/blender/editors/space_sequencer/CMakeLists.txt index db4b9e09585..cd0c4eb839c 100644 --- a/source/blender/editors/space_sequencer/CMakeLists.txt +++ b/source/blender/editors/space_sequencer/CMakeLists.txt @@ -27,85 +27,15 @@ FILE(GLOB SRC *.c) SET(INC - ../../windowmanager - ../../editors/include - ../../editors/interface + ../../blenkernel + ../../blenlib + ../../imbuf + ../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 + ../../makesdna + ../../makesrna + ../../windowmanager ../../../../intern/audaspace/intern - ../../nodes - ../../gpu - ../../blenfont - ../../ikplugin ) -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_space_sequencer "${SRC}" "${INC}") diff --git a/source/blender/editors/space_sound/CMakeLists.txt b/source/blender/editors/space_sound/CMakeLists.txt index 500b461c260..60c8f5e44bd 100644 --- a/source/blender/editors/space_sound/CMakeLists.txt +++ b/source/blender/editors/space_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,13 @@ 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_space_sound "${SRC}" "${INC}") diff --git a/source/blender/editors/space_text/CMakeLists.txt b/source/blender/editors/space_text/CMakeLists.txt index d694661460f..3e89cdb1770 100644 --- a/source/blender/editors/space_text/CMakeLists.txt +++ b/source/blender/editors/space_text/CMakeLists.txt @@ -27,85 +27,20 @@ FILE(GLOB SRC *.c) SET(INC - ../../windowmanager - ../../editors/include - ../../editors/interface - ../../../../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 + ../../blenkernel + ../../blenlib + ../include + ../../../../intern/guardedalloc + ../../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}) + SET(INC ${INC} ${PYTHON_INC} ../../python) 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_text "${SRC}" "${INC}") diff --git a/source/blender/editors/space_time/CMakeLists.txt b/source/blender/editors/space_time/CMakeLists.txt index 31502fff955..39b7ba355b9 100644 --- a/source/blender/editors/space_time/CMakeLists.txt +++ b/source/blender/editors/space_time/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,13 @@ 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_space_time "${SRC}" "${INC}") diff --git a/source/blender/editors/space_userpref/CMakeLists.txt b/source/blender/editors/space_userpref/CMakeLists.txt index cb41001b106..1752f39cfa5 100644 --- a/source/blender/editors/space_userpref/CMakeLists.txt +++ b/source/blender/editors/space_userpref/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,13 @@ FILE(GLOB SRC *.c) SET(INC - ../../windowmanager - ../../editors/include - ../../editors/interface + ../include + ../../blenkernel + ../../blenlib ../../../../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_space_userpref "${SRC}" "${INC}") diff --git a/source/blender/editors/space_userpref/SConscript b/source/blender/editors/space_userpref/SConscript index 1b808a5a7c0..3ba1543b840 100644 --- a/source/blender/editors/space_userpref/SConscript +++ b/source/blender/editors/space_userpref/SConscript @@ -8,7 +8,4 @@ incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' defs = [] -if env['WITH_BF_GAMEENGINE']: - defs.append('GAMEBLENDER=1') - env.BlenderLib ( 'bf_editors_space_userpref', sources, Split(incs), defs, libtype=['core'], priority=[70] ) diff --git a/source/blender/editors/space_view3d/CMakeLists.txt b/source/blender/editors/space_view3d/CMakeLists.txt index f17d5c07216..20a45e34d84 100644 --- a/source/blender/editors/space_view3d/CMakeLists.txt +++ b/source/blender/editors/space_view3d/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,27 @@ FILE(GLOB SRC *.c) SET(INC - ../../windowmanager - ../../editors/include - ../../editors/interface + ../include + ../../blenfont + ../../blenkernel + ../../blenlib + ../../gpu + ../../imbuf ../../../../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 + ../../render/extern/include + ../../windowmanager ) -ADD_DEFINITIONS(-DGLEW_STATIC) - IF(WITH_GAMEENGINE) + SET(INC ${INC} ../../../kernel/gen_system) 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_space_view3d "${SRC}" "${INC}") diff --git a/source/blender/editors/transform/CMakeLists.txt b/source/blender/editors/transform/CMakeLists.txt index 5ca527f7144..6f1bc69eb9f 100644 --- a/source/blender/editors/transform/CMakeLists.txt +++ b/source/blender/editors/transform/CMakeLists.txt @@ -27,85 +27,13 @@ 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_transform "${SRC}" "${INC}") diff --git a/source/blender/editors/util/CMakeLists.txt b/source/blender/editors/util/CMakeLists.txt index 5fcf465a63c..b4b2fd12cef 100644 --- a/source/blender/editors/util/CMakeLists.txt +++ b/source/blender/editors/util/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,13 @@ 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_util "${SRC}" "${INC}") diff --git a/source/blender/editors/uvedit/CMakeLists.txt b/source/blender/editors/uvedit/CMakeLists.txt index ba38f3d74a8..297863b2a9f 100644 --- a/source/blender/editors/uvedit/CMakeLists.txt +++ b/source/blender/editors/uvedit/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_uvedit "${SRC}" "${INC}") |