finish cleanup to cmake editors, also removed some stuff from scons thats not needed.

diff --git a/source/blender/editors/CMakeLists.txt b/source/blender/editors/CMakeLists.txt
index e02cff3898f56003e96ffdc4514dd38e335ac109..5d3cee9a7a59a27fc93ccd89ccbf1c98f38f6b0e 100644 (file)
--- 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 1f1b9d8b486e75a7e2f6506d3a9eb1b0858af453..d5eef6bbd349045f6fe1f9ca6694f280f2cb3f6e 100644 (file)
--- 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 f9c1095963650400f90a0d21cf6eada396e2d2e2..f9136b69d9e7623d17c974b07b8669e4a89255ad 100644 (file)
--- 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 5fe7e0411fa49b7c25da29baf15150906b6bd6a0..ab45d73a2de6c17f3ca092fab358adf79e94b989 100644 (file)
--- 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 a27643f750b902dd1f6359219c5bb785d41f3213..d37ee338733b27f09ad91dcc00056d93ab96618d 100644 (file)
--- 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 9f70659cf1515b3b6d0cf6c1452bcae718d54dab..394418b56887765315437dd33eb3e97535d98899 100644 (file)
--- 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 bf2a4b1bfc3fdbe1813c2e32859b8dd6def6e481..29ceb1fd82ec9e8601ed910d9f0126daa3aa8fa8 100644 (file)
--- 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 dd6fee5f7da1e9e406e93177c2c215c47799b206..5f75ceb34efbb69085fdd52669c0c984e1a2f6bf 100644 (file)
--- 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 5de869f09d3e5c10968f04b0f3a3754f6c8b4c6b..4545014c47fd664be4fa97aa92d64da3e69521e9 100644 (file)
--- 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 95310666f72003e0fc653ef6026dea0bfe12b2e2..5e821a5c1e8efe9d3305033e149374d976e9a3b8 100644 (file)
--- 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 c5843ab665ab7d5ec4d1e5602e61f0c596eec233..a41b9e89f831bbcbbe54795b342f24e8fd0aa2bf 100644 (file)
--- 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 d51f9c6790b6a1886c03250222aa21cb585683d2..d84754b561d2498a9069066af927112cb151f9e3 100644 (file)
--- 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 ebda196a6f3500f3334ec7d3354eccb31aef00e1..fcfa673c176f11f0897db8abd4250da4f20fe197 100644 (file)
--- 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 8ac38115c1a34e871fbd9665cd9baa2171b5ad4d..6bbd1112d05c25880451e2ac80fb90c5fccf0430 100644 (file)
--- 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 703a16f753b23b4e62121f5fd13faf43c9349c38..6efb2617a18a82cb9f2b7b079efc4b64f9daf3e3 100644 (file)
--- 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 3bf7fab49841b2409bce1da1f6af24f4f75f0a86..758a2b1d8ef219dc7893128827d8b8addbd8f54e 100644 (file)
--- 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 9d0aefe5d7dc5e37fe7b07a32cc1d83a11e59535..f0493d8e2d8948726a57d6f714b51dbae8409843 100644 (file)
--- 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 525f67fdc113e430a159edd677413fecb67261d7..02765726c6e9c6ea37394849432b6d3b97fea9c0 100644 (file)
--- 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 9d2cd2b7cf58220cd02ce01c2434b1bf326c96e4..8010dd49c5713809295a58413e6e5693dc3f231e 100644 (file)
--- 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 509b77b9a2b1b387a1a4500db20a0fa1b1d00500..85275b2db23a339d6bd6819c00ef74afd5bccb6e 100644 (file)
--- 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 417913807d8362313416d988eb7412ed09c26e6c..591e97f800fed8d52ed15c89bb67bb54b67f0b00 100644 (file)
--- 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 c3105d3e50cef76d69e2cec26dd39af3a30aebd9..c499d5865ec30781ca7c6e8cc9d43a09b8a81ad2 100644 (file)
--- 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 70c0423202d102526779269714099845cbe563f3..bb50ac0cc86337390a8e33c53043f016026d3e31 100644 (file)
--- 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 a0a7dad4077704da4866c478dcd628658cd3870a..31438b641e0329b3576740a8c8a76b335e75d239 100644 (file)
--- 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 8646edd2efa80e14614ba922bb6008a04f1f4cf9..0cee45576b8b712aa24d795a8d36329efa0efb9d 100644 (file)
--- 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 8a2f4e85f961f6476d73afbb0ab4a25d11662ec4..035af2296038e4a5f6d05aaff065088693d62b09 100644 (file)
--- 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 900f9392a76335df77763ba5cb3fb01b4f15db21..021e25953b0b2e3fe1c13dc18aac5e4dc6d795ec 100644 (file)
--- 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 d0e5e74f257b5682bb07038952e72b15bc5da06e..6ad95d920c606fd82665e8555bd1487db6fe0d7e 100644 (file)
--- 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 7fd3079f92fc912034b9078498dfb872dc05d903..34c7c774774eb06a09b5f148ec8a0dd45fd04d62 100644 (file)
--- 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 d559a5c6f17db89e13291d90b21e064ee2d7f1ba..91087d57f11565e3e51916786d55cc1a03960efa 100644 (file)
--- 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 67b39b1589b817d50a18ee65b77bdc5deeb81817..be8020b07932e5b57f3b31fc00923bac2ffbce29 100644 (file)
--- 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 8be645cb324f418085fd9435374723a89117e33c..78c4fcbdd8d7a0f15a6d1b688c0218595cb8326e 100644 (file)
--- 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 6d93c17fc77ddc75d6292685be64baa3b374954b..58b3affe2d41474dae25a3611a2ee9483a54dd49 100644 (file)
--- 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 cd0c4eb839cb22d0d5099a7c8d7e240b557f9752..383cc05b7f7b7bd07534d8b15b0b76710cf66099 100644 (file)
--- 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 3e89cdb1770193004e245cae8ae86482c7dca07a..0616cf5147a0f8a2fb3ac0cc60f3770227a4c510 100644 (file)
--- 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 6f1bc69eb9f538a249fdf6a5516f8986efaba8ce..e67771270cf659b4deccbc17a0a6641b087a1816 100644 (file)
--- 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 *****