From 2ebb1c63f7b26478ed4c85d572312adf562b3148 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 5 Jun 2010 23:27:49 +0000 Subject: finish cleanup to cmake editors, also removed some stuff from scons thats not needed. --- source/blender/editors/CMakeLists.txt | 5 -- source/blender/editors/animation/CMakeLists.txt | 87 ++------------------- source/blender/editors/armature/CMakeLists.txt | 83 ++------------------ source/blender/editors/curve/CMakeLists.txt | 87 ++------------------- source/blender/editors/datafiles/CMakeLists.txt | 89 +-------------------- source/blender/editors/gpencil/CMakeLists.txt | 88 ++------------------- source/blender/editors/interface/CMakeLists.txt | 83 +++----------------- source/blender/editors/mesh/CMakeLists.txt | 85 ++------------------ source/blender/editors/mesh/editmesh.c | 3 - source/blender/editors/metaball/CMakeLists.txt | 88 ++------------------- source/blender/editors/object/CMakeLists.txt | 88 +++------------------ source/blender/editors/physics/CMakeLists.txt | 80 ++----------------- source/blender/editors/render/CMakeLists.txt | 82 +++---------------- source/blender/editors/screen/CMakeLists.txt | 87 ++------------------- source/blender/editors/screen/SConscript | 11 +-- source/blender/editors/screen/area.c | 4 - source/blender/editors/sculpt_paint/CMakeLists.txt | 86 ++------------------ source/blender/editors/sound/CMakeLists.txt | 88 ++------------------- source/blender/editors/sound/SConscript | 2 +- source/blender/editors/space_action/CMakeLists.txt | 88 ++------------------- source/blender/editors/space_api/CMakeLists.txt | 89 ++------------------- source/blender/editors/space_api/SConscript | 3 - .../blender/editors/space_buttons/CMakeLists.txt | 89 ++------------------- source/blender/editors/space_buttons/SConscript | 3 - .../blender/editors/space_console/CMakeLists.txt | 91 +++------------------- .../blender/editors/space_console/space_console.c | 4 +- source/blender/editors/space_file/CMakeLists.txt | 5 -- source/blender/editors/space_graph/CMakeLists.txt | 5 -- source/blender/editors/space_image/CMakeLists.txt | 5 -- source/blender/editors/space_logic/CMakeLists.txt | 5 -- source/blender/editors/space_nla/CMakeLists.txt | 5 -- .../blender/editors/space_outliner/CMakeLists.txt | 5 -- source/blender/editors/space_script/CMakeLists.txt | 5 -- .../blender/editors/space_sequencer/CMakeLists.txt | 5 -- source/blender/editors/space_text/CMakeLists.txt | 5 -- source/blender/editors/transform/CMakeLists.txt | 5 -- 36 files changed, 130 insertions(+), 1513 deletions(-) diff --git a/source/blender/editors/CMakeLists.txt b/source/blender/editors/CMakeLists.txt index e02cff3898f..5d3cee9a7a5 100644 --- a/source/blender/editors/CMakeLists.txt +++ b/source/blender/editors/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 ***** diff --git a/source/blender/editors/animation/CMakeLists.txt b/source/blender/editors/animation/CMakeLists.txt index 1f1b9d8b486..d5eef6bbd34 100644 --- a/source/blender/editors/animation/CMakeLists.txt +++ b/source/blender/editors/animation/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 + ../include + ../../blenkernel + ../../blenlib + ../../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_animation "${SRC}" "${INC}") diff --git a/source/blender/editors/armature/CMakeLists.txt b/source/blender/editors/armature/CMakeLists.txt index f9c10959636..f9136b69d9e 100644 --- a/source/blender/editors/armature/CMakeLists.txt +++ b/source/blender/editors/armature/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,19 @@ FILE(GLOB SRC *.c) SET(INC + ../include + ../../blenkernel + ../../blenlib + ../../makesdna + ../../makesrna + ../../render/extern/include ../../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_armature "${SRC}" "${INC}") diff --git a/source/blender/editors/curve/CMakeLists.txt b/source/blender/editors/curve/CMakeLists.txt index 5fe7e0411fa..ab45d73a2de 100644 --- a/source/blender/editors/curve/CMakeLists.txt +++ b/source/blender/editors/curve/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 + ../include + ../../blenkernel + ../../blenlib + ../../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_curve "${SRC}" "${INC}") diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt index a27643f750b..d37ee338733 100644 --- a/source/blender/editors/datafiles/CMakeLists.txt +++ b/source/blender/editors/datafiles/CMakeLists.txt @@ -2,7 +2,7 @@ # ***** BEGIN GPL LICENSE BLOCK ***** # # This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License +# modify it under the terms of the GNU General Public LicenseS # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. # @@ -15,97 +15,12 @@ # 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 ***** 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 -) - -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) +SET(INC "") BLENDERLIB(bf_editor_datafiles "${SRC}" "${INC}") diff --git a/source/blender/editors/gpencil/CMakeLists.txt b/source/blender/editors/gpencil/CMakeLists.txt index 9f70659cf15..394418b5688 100644 --- a/source/blender/editors/gpencil/CMakeLists.txt +++ b/source/blender/editors/gpencil/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 + ../include + ../../blenkernel + ../../blenlib + ../../imbuf + ../../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_gpencil "${SRC}" "${INC}") diff --git a/source/blender/editors/interface/CMakeLists.txt b/source/blender/editors/interface/CMakeLists.txt index bf2a4b1bfc3..29ceb1fd82e 100644 --- a/source/blender/editors/interface/CMakeLists.txt +++ b/source/blender/editors/interface/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,25 @@ FILE(GLOB SRC *.c) SET(INC + ../include + ../../blenfont + ../../blenkernel + ../../blenlib + ../../gpu + ../../imbuf + ../../makesdna + ../../makesrna + ../../python ../../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_interface "${SRC}" "${INC}") diff --git a/source/blender/editors/mesh/CMakeLists.txt b/source/blender/editors/mesh/CMakeLists.txt index dd6fee5f7da..5f75ceb34ef 100644 --- a/source/blender/editors/mesh/CMakeLists.txt +++ b/source/blender/editors/mesh/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,19 @@ FILE(GLOB SRC *.c) SET(INC + ../include + ../../blenkernel + ../../blenlib + ../../imbuf + ../../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 + ../../../../intern/guardedalloc ) -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_mesh "${SRC}" "${INC}") diff --git a/source/blender/editors/mesh/editmesh.c b/source/blender/editors/mesh/editmesh.c index 5de869f09d3..4545014c47f 100644 --- a/source/blender/editors/mesh/editmesh.c +++ b/source/blender/editors/mesh/editmesh.c @@ -60,9 +60,6 @@ #include "BKE_texture.h" #include "BKE_utildefines.h" -#include "LBM_fluidsim.h" - - #include "ED_mesh.h" #include "ED_object.h" #include "ED_retopo.h" diff --git a/source/blender/editors/metaball/CMakeLists.txt b/source/blender/editors/metaball/CMakeLists.txt index 95310666f72..5e821a5c1e8 100644 --- a/source/blender/editors/metaball/CMakeLists.txt +++ b/source/blender/editors/metaball/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 + ../include + ../../blenkernel + ../../blenlib + ../../makesdna + ../../makesrna + ../../render/extern/include ../../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_metaball "${SRC}" "${INC}") diff --git a/source/blender/editors/object/CMakeLists.txt b/source/blender/editors/object/CMakeLists.txt index c5843ab665a..a41b9e89f83 100644 --- a/source/blender/editors/object/CMakeLists.txt +++ b/source/blender/editors/object/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,26 @@ 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 + ../include + ../../blenkernel + ../../blenlib ../../gpu - ../../blenfont ../../ikplugin + ../../imbuf + ../../makesdna + ../../makesrna + ../../python + ../../windowmanager + ../../render/extern/include + ../../../../intern/guardedalloc ) -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) +IF(NOT WITH_PYTHON) ADD_DEFINITIONS(-DDISABLE_PYTHON) -ENDIF(WITH_PYTHON) +ENDIF(NOT WITH_PYTHON) IF(WIN32) SET(INC ${INC} ${PTHREADS_INC}) ENDIF(WIN32) -IF(WITH_BUILDINFO) - ADD_DEFINITIONS(-DNAN_BUILDINFO) -ENDIF(WITH_BUILDINFO) - BLENDERLIB(bf_editor_object "${SRC}" "${INC}") diff --git a/source/blender/editors/physics/CMakeLists.txt b/source/blender/editors/physics/CMakeLists.txt index d51f9c6790b..d84754b561d 100644 --- a/source/blender/editors/physics/CMakeLists.txt +++ b/source/blender/editors/physics/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,22 @@ FILE(GLOB SRC *.c) SET(INC + ../include + ../../blenkernel + ../../blenlib + ../../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 + ../../../../intern/guardedalloc ) -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_physics "${SRC}" "${INC}") diff --git a/source/blender/editors/render/CMakeLists.txt b/source/blender/editors/render/CMakeLists.txt index ebda196a6f3..fcfa673c176 100644 --- a/source/blender/editors/render/CMakeLists.txt +++ b/source/blender/editors/render/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,32 @@ 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 - ../../../../intern/audaspace/intern - ../../nodes ../../gpu - ../../blenfont - ../../ikplugin + ../../imbuf + ../include + ../../../../intern/guardedalloc + ../../makesdna + ../../makesrna + ../../python + ../../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) + 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_render "${SRC}" "${INC}") diff --git a/source/blender/editors/screen/CMakeLists.txt b/source/blender/editors/screen/CMakeLists.txt index 8ac38115c1a..6bbd1112d05 100644 --- a/source/blender/editors/screen/CMakeLists.txt +++ b/source/blender/editors/screen/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,19 @@ 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 + ../../imbuf + ../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}) -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_screen "${SRC}" "${INC}") diff --git a/source/blender/editors/screen/SConscript b/source/blender/editors/screen/SConscript index 703a16f753b..6efb2617a18 100644 --- a/source/blender/editors/screen/SConscript +++ b/source/blender/editors/screen/SConscript @@ -4,17 +4,12 @@ Import ('env') sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../blenfont ../../makesdna ../../imbuf' -incs += ' ../../blenloader ../../windowmanager ../../python ../../makesrna ../../gpu' +incs += ' ../../blenloader ../../windowmanager ../../makesrna ../../gpu' incs += ' ../../render/extern/include' incs += ' #/intern/guardedalloc #/extern/glew/include' defs = '' -if not env['WITH_BF_PYTHON']: - defs += 'DISABLE_PYTHON' -if env['WITH_BF_OPENEXR']: - defs += ' WITH_OPENEXR' - if env['OURPLATFORM'] == 'linux2': cflags='-pthread' incs += ' ../../../extern/binreloc/include' @@ -22,8 +17,4 @@ if env['OURPLATFORM'] == 'linux2': if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): incs += ' ' + env['BF_PTHREADS_INC'] -if env['OURPLATFORM'] == 'darwin': - if env['WITH_BF_OPENMP']: - defs += ' PARALLEL=1' - env.BlenderLib ( 'bf_editors_screen', sources, Split(incs), Split(defs), libtype=['core'], priority=[105] ) diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index 3bf7fab4984..758a2b1d8ef 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -59,10 +59,6 @@ #include "UI_resources.h" #include "UI_view2d.h" -#ifndef DISABLE_PYTHON -#include "BPY_extern.h" -#endif - #include "screen_intern.h" /* general area and region code */ diff --git a/source/blender/editors/sculpt_paint/CMakeLists.txt b/source/blender/editors/sculpt_paint/CMakeLists.txt index 9d0aefe5d7d..f0493d8e2d8 100644 --- a/source/blender/editors/sculpt_paint/CMakeLists.txt +++ b/source/blender/editors/sculpt_paint/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,20 @@ FILE(GLOB SRC *.c) SET(INC - ../../windowmanager - ../../editors/include - ../../editors/interface + ../../blenkernel + ../../imbuf + ../../gpu + ../../blenlib + ../include ../../../../intern/guardedalloc - ../../../../intern/memutil - ../../blenlib ../../makesdna - ../../makesrna ../../blenkernel - ../../include ../../imbuf + ../../makesdna + ../../makesrna + ../../windowmanager ../../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_sculpt_paint "${SRC}" "${INC}") 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 = [] diff --git a/source/blender/editors/space_action/CMakeLists.txt b/source/blender/editors/space_action/CMakeLists.txt index 509b77b9a2b..85275b2db23 100644 --- a/source/blender/editors/space_action/CMakeLists.txt +++ b/source/blender/editors/space_action/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_space_action "${SRC}" "${INC}") diff --git a/source/blender/editors/space_api/CMakeLists.txt b/source/blender/editors/space_api/CMakeLists.txt index 417913807d8..591e97f800f 100644 --- a/source/blender/editors/space_api/CMakeLists.txt +++ b/source/blender/editors/space_api/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_api "${SRC}" "${INC}") diff --git a/source/blender/editors/space_api/SConscript b/source/blender/editors/space_api/SConscript index c3105d3e50c..c499d5865ec 100644 --- a/source/blender/editors/space_api/SConscript +++ b/source/blender/editors/space_api/SConscript @@ -9,7 +9,4 @@ incs += ' #/intern/guardedalloc #/extern/glew/include' defs = '' -if not env['WITH_BF_PYTHON']: - defs += 'DISABLE_PYTHON' - env.BlenderLib ( 'bf_editors_space_api', sources, Split(incs), Split(defs), libtype=['core'], priority=[30] ) diff --git a/source/blender/editors/space_buttons/CMakeLists.txt b/source/blender/editors/space_buttons/CMakeLists.txt index 70c0423202d..bb50ac0cc86 100644 --- a/source/blender/editors/space_buttons/CMakeLists.txt +++ b/source/blender/editors/space_buttons/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_buttons "${SRC}" "${INC}") diff --git a/source/blender/editors/space_buttons/SConscript b/source/blender/editors/space_buttons/SConscript index a0a7dad4077..31438b641e0 100644 --- a/source/blender/editors/space_buttons/SConscript +++ b/source/blender/editors/space_buttons/SConscript @@ -9,7 +9,4 @@ incs += ' ../../makesrna ../../render/extern/include' defs = [] -if env['WITH_BF_GAMEENGINE']: - defs.append('GAMEBLENDER=1') - env.BlenderLib ( 'bf_editors_space_buttons', sources, Split(incs), defs, libtype=['core'], priority=[120] ) diff --git a/source/blender/editors/space_console/CMakeLists.txt b/source/blender/editors/space_console/CMakeLists.txt index 8646edd2efa..0cee45576b8 100644 --- a/source/blender/editors/space_console/CMakeLists.txt +++ b/source/blender/editors/space_console/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,19 @@ 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 + ../../blenloader + ../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}) -ELSE(WITH_PYTHON) +IF(NOT 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) +ENDIF(NOT WITH_PYTHON) BLENDERLIB(bf_editor_space_console "${SRC}" "${INC}") diff --git a/source/blender/editors/space_console/space_console.c b/source/blender/editors/space_console/space_console.c index 8a2f4e85f96..035af229603 100644 --- a/source/blender/editors/space_console/space_console.c +++ b/source/blender/editors/space_console/space_console.c @@ -35,8 +35,8 @@ #include "MEM_guardedalloc.h" -#include "BLO_readfile.h" - +#include "BLO_readfile.h" /* get the ID name for dnd*/ + #include "BLI_blenlib.h" #include "BLI_math.h" diff --git a/source/blender/editors/space_file/CMakeLists.txt b/source/blender/editors/space_file/CMakeLists.txt index 900f9392a76..021e25953b0 100644 --- a/source/blender/editors/space_file/CMakeLists.txt +++ b/source/blender/editors/space_file/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 ***** diff --git a/source/blender/editors/space_graph/CMakeLists.txt b/source/blender/editors/space_graph/CMakeLists.txt index d0e5e74f257..6ad95d920c6 100644 --- a/source/blender/editors/space_graph/CMakeLists.txt +++ b/source/blender/editors/space_graph/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 ***** diff --git a/source/blender/editors/space_image/CMakeLists.txt b/source/blender/editors/space_image/CMakeLists.txt index 7fd3079f92f..34c7c774774 100644 --- a/source/blender/editors/space_image/CMakeLists.txt +++ b/source/blender/editors/space_image/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 ***** diff --git a/source/blender/editors/space_logic/CMakeLists.txt b/source/blender/editors/space_logic/CMakeLists.txt index d559a5c6f17..91087d57f11 100644 --- a/source/blender/editors/space_logic/CMakeLists.txt +++ b/source/blender/editors/space_logic/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 ***** diff --git a/source/blender/editors/space_nla/CMakeLists.txt b/source/blender/editors/space_nla/CMakeLists.txt index 67b39b1589b..be8020b0793 100644 --- a/source/blender/editors/space_nla/CMakeLists.txt +++ b/source/blender/editors/space_nla/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 ***** diff --git a/source/blender/editors/space_outliner/CMakeLists.txt b/source/blender/editors/space_outliner/CMakeLists.txt index 8be645cb324..78c4fcbdd8d 100644 --- a/source/blender/editors/space_outliner/CMakeLists.txt +++ b/source/blender/editors/space_outliner/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 ***** diff --git a/source/blender/editors/space_script/CMakeLists.txt b/source/blender/editors/space_script/CMakeLists.txt index 6d93c17fc77..58b3affe2d4 100644 --- a/source/blender/editors/space_script/CMakeLists.txt +++ b/source/blender/editors/space_script/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 ***** diff --git a/source/blender/editors/space_sequencer/CMakeLists.txt b/source/blender/editors/space_sequencer/CMakeLists.txt index cd0c4eb839c..383cc05b7f7 100644 --- a/source/blender/editors/space_sequencer/CMakeLists.txt +++ b/source/blender/editors/space_sequencer/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 ***** diff --git a/source/blender/editors/space_text/CMakeLists.txt b/source/blender/editors/space_text/CMakeLists.txt index 3e89cdb1770..0616cf5147a 100644 --- a/source/blender/editors/space_text/CMakeLists.txt +++ b/source/blender/editors/space_text/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 ***** diff --git a/source/blender/editors/transform/CMakeLists.txt b/source/blender/editors/transform/CMakeLists.txt index 6f1bc69eb9f..e67771270cf 100644 --- a/source/blender/editors/transform/CMakeLists.txt +++ b/source/blender/editors/transform/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 ***** -- cgit v1.2.3