remove cruft from cmake files, more to go
authorCampbell Barton <ideasman42@gmail.com>
Fri, 4 Jun 2010 20:56:56 +0000 (20:56 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 4 Jun 2010 20:56:56 +0000 (20:56 +0000)
20 files changed:
source/blender/editors/space_file/CMakeLists.txt
source/blender/editors/space_graph/CMakeLists.txt
source/blender/editors/space_image/CMakeLists.txt
source/blender/editors/space_info/CMakeLists.txt
source/blender/editors/space_info/SConscript
source/blender/editors/space_logic/CMakeLists.txt
source/blender/editors/space_nla/CMakeLists.txt
source/blender/editors/space_node/CMakeLists.txt
source/blender/editors/space_outliner/CMakeLists.txt
source/blender/editors/space_script/CMakeLists.txt
source/blender/editors/space_sequencer/CMakeLists.txt
source/blender/editors/space_sound/CMakeLists.txt
source/blender/editors/space_text/CMakeLists.txt
source/blender/editors/space_time/CMakeLists.txt
source/blender/editors/space_userpref/CMakeLists.txt
source/blender/editors/space_userpref/SConscript
source/blender/editors/space_view3d/CMakeLists.txt
source/blender/editors/transform/CMakeLists.txt
source/blender/editors/util/CMakeLists.txt
source/blender/editors/uvedit/CMakeLists.txt

index 21eb49c795c8bdae32c8b6d11c785ea0b17d4f19..338d30c8f5a4c4e950d5c631ff59db076a42c746 100644 (file)
 FILE(GLOB SRC *.c)
 
 SET(INC
-       ../../windowmanager
-       ../../editors/include
-       ../../editors/interface
-       ../../../../intern/guardedalloc
-       ../../../../intern/memutil
-       ../../blenlib ../../makesdna
-       ../../makesrna ../../blenkernel
-       ../../include ../../imbuf
-       ../../render/extern/include
-       ../../../../intern/bsp/extern
-       ../../../../intern/decimation/extern
+       ../../blenfont
+       ../../blenkernel
+       ../../blenlib
        ../../blenloader
-       ../../python
-       ../../../kernel/gen_system
-       ../../readstreamglue
-       ../../../../intern/elbeem/extern
-       ../../../../intern/ghost
-       ../../../../intern/opennl/extern
-       ../../../../extern/glew/include
-       ../../../../intern/smoke/extern
+       ../../imbuf
+       ../include
        ../../../../intern/audaspace/intern
-       ../../nodes
-       ../../gpu
-       ../../blenfont
-       ../../ikplugin
+       ../../../../intern/guardedalloc
+       ../../makesdna
+       ../../makesrna
+       ../../render/extern/include
+       ../../windowmanager
 )
 
-ADD_DEFINITIONS(-DGLEW_STATIC)
-
-IF(WITH_GAMEENGINE)
-       ADD_DEFINITIONS(-DGAMEBLENDER)
-ENDIF(WITH_GAMEENGINE)
-
-IF(WITH_INTERNATIONAL)
-       ADD_DEFINITIONS(-DINTERNATIONAL)
-ENDIF(WITH_INTERNATIONAL)
-
 IF(WITH_OPENEXR)
        ADD_DEFINITIONS(-DWITH_OPENEXR)
 ENDIF(WITH_OPENEXR)
@@ -76,36 +53,8 @@ IF(WITH_OPENJPEG)
        ADD_DEFINITIONS(-DWITH_OPENJPEG)
 ENDIF(WITH_OPENJPEG)
 
-IF(WITH_QUICKTIME)
-       SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
-       ADD_DEFINITIONS(-DWITH_QUICKTIME)
-ENDIF(WITH_QUICKTIME)
-
-IF(WITH_FFMPEG)
-       SET(INC ${INC} ${FFMPEG_INC})
-       ADD_DEFINITIONS(-DWITH_FFMPEG)
-ENDIF(WITH_FFMPEG)
-
-IF(WITH_OPENMP)
-               ADD_DEFINITIONS(-DPARALLEL=1)
-ENDIF(WITH_OPENMP)
-
-IF(NOT WITH_ELBEEM)
-       ADD_DEFINITIONS(-DDISABLE_ELBEEM)
-ENDIF(NOT WITH_ELBEEM)
-
-IF(WITH_PYTHON)
-       SET(INC ${INC} ${PYTHON_INC})
-ELSE(WITH_PYTHON)
-       ADD_DEFINITIONS(-DDISABLE_PYTHON)
-ENDIF(WITH_PYTHON)
-
-IF(WIN32)
-       SET(INC ${INC} ${PTHREADS_INC})
-ENDIF(WIN32)
-
-IF(WITH_BUILDINFO)
-       ADD_DEFINITIONS(-DNAN_BUILDINFO)
-ENDIF(WITH_BUILDINFO)
+IF(WITH_DDS)
+       ADD_DEFINITIONS(-DWITH_DDS)
+ENDIF(WITH_DDS)
 
 BLENDERLIB(bf_editor_space_file "${SRC}" "${INC}")
index 9d743ec1aad4cbc8e21af984915d2075e5643bcc..d0e5e74f257b5682bb07038952e72b15bc5da06e 100644 (file)
 FILE(GLOB SRC *.c)
 
 SET(INC
-       ../../windowmanager
-       ../../editors/include
-       ../../editors/interface
+       ../../blenkernel
+       ../../blenlib
+       ../include
        ../../../../intern/guardedalloc
-       ../../../../intern/memutil
-       ../../blenlib ../../makesdna
-       ../../makesrna ../../blenkernel
-       ../../include ../../imbuf
-       ../../render/extern/include
-       ../../../../intern/bsp/extern
-       ../../../../intern/decimation/extern
-       ../../blenloader
-       ../../python
-       ../../../kernel/gen_system
-       ../../readstreamglue
-       ../../../../intern/elbeem/extern
-       ../../../../intern/ghost
-       ../../../../intern/opennl/extern
-       ../../../../extern/glew/include
-       ../../../../intern/smoke/extern
+       ../../makesdna
+       ../../makesrna
+       ../../windowmanager
        ../../../../intern/audaspace/intern
-       ../../nodes
-       ../../gpu
-       ../../blenfont
-       ../../ikplugin
 )
 
-ADD_DEFINITIONS(-DGLEW_STATIC)
-
-IF(WITH_GAMEENGINE)
-       ADD_DEFINITIONS(-DGAMEBLENDER)
-ENDIF(WITH_GAMEENGINE)
-
-IF(WITH_INTERNATIONAL)
-       ADD_DEFINITIONS(-DINTERNATIONAL)
-ENDIF(WITH_INTERNATIONAL)
-
-IF(WITH_OPENEXR)
-       ADD_DEFINITIONS(-DWITH_OPENEXR)
-ENDIF(WITH_OPENEXR)
-
-IF(WITH_TIFF)
-       ADD_DEFINITIONS(-DWITH_TIFF)
-ENDIF(WITH_TIFF)
-
-IF(WITH_OPENJPEG)
-       ADD_DEFINITIONS(-DWITH_OPENJPEG)
-ENDIF(WITH_OPENJPEG)
-
-IF(WITH_QUICKTIME)
-       SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
-       ADD_DEFINITIONS(-DWITH_QUICKTIME)
-ENDIF(WITH_QUICKTIME)
-
-IF(WITH_FFMPEG)
-       SET(INC ${INC} ${FFMPEG_INC})
-       ADD_DEFINITIONS(-DWITH_FFMPEG)
-ENDIF(WITH_FFMPEG)
-
-IF(WITH_OPENMP)
-               ADD_DEFINITIONS(-DPARALLEL=1)
-ENDIF(WITH_OPENMP)
-
-IF(NOT WITH_ELBEEM)
-       ADD_DEFINITIONS(-DDISABLE_ELBEEM)
-ENDIF(NOT WITH_ELBEEM)
-
-IF(WITH_PYTHON)
-       SET(INC ${INC} ${PYTHON_INC})
-ELSE(WITH_PYTHON)
-       ADD_DEFINITIONS(-DDISABLE_PYTHON)
-ENDIF(WITH_PYTHON)
-
-IF(WIN32)
-       SET(INC ${INC} ${PTHREADS_INC})
-ENDIF(WIN32)
-
-IF(WITH_BUILDINFO)
-       ADD_DEFINITIONS(-DNAN_BUILDINFO)
-ENDIF(WITH_BUILDINFO)
-
 BLENDERLIB(bf_editor_space_graph "${SRC}" "${INC}")
index 0947fa6f9bbffe52c9877c9ea9de145475f9d38c..7fd3079f92fc912034b9078498dfb872dc05d903 100644 (file)
 FILE(GLOB SRC *.c)
 
 SET(INC
-       ../../windowmanager
-       ../../editors/include
-       ../../editors/interface
+       ../../blenkernel
+       ../../blenlib
+       ../../imbuf
+       ../include
        ../../../../intern/guardedalloc
-       ../../../../intern/memutil
-       ../../blenlib ../../makesdna
-       ../../makesrna ../../blenkernel
-       ../../include ../../imbuf
+       ../../makesdna
+       ../../makesrna
        ../../render/extern/include
-       ../../../../intern/bsp/extern
-       ../../../../intern/decimation/extern
-       ../../blenloader
-       ../../python
-       ../../../kernel/gen_system
-       ../../readstreamglue
-       ../../../../intern/elbeem/extern
-       ../../../../intern/ghost
-       ../../../../intern/opennl/extern
-       ../../../../extern/glew/include
-       ../../../../intern/smoke/extern
-       ../../../../intern/audaspace/intern
-       ../../nodes
-       ../../gpu
-       ../../blenfont
-       ../../ikplugin
+       ../../windowmanager
 )
 
-ADD_DEFINITIONS(-DGLEW_STATIC)
-
-IF(WITH_GAMEENGINE)
-       ADD_DEFINITIONS(-DGAMEBLENDER)
-ENDIF(WITH_GAMEENGINE)
-
-IF(WITH_INTERNATIONAL)
-       ADD_DEFINITIONS(-DINTERNATIONAL)
-ENDIF(WITH_INTERNATIONAL)
-
 IF(WITH_OPENEXR)
        ADD_DEFINITIONS(-DWITH_OPENEXR)
 ENDIF(WITH_OPENEXR)
@@ -72,40 +46,8 @@ IF(WITH_TIFF)
        ADD_DEFINITIONS(-DWITH_TIFF)
 ENDIF(WITH_TIFF)
 
-IF(WITH_OPENJPEG)
-       ADD_DEFINITIONS(-DWITH_OPENJPEG)
-ENDIF(WITH_OPENJPEG)
-
-IF(WITH_QUICKTIME)
-       SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
-       ADD_DEFINITIONS(-DWITH_QUICKTIME)
-ENDIF(WITH_QUICKTIME)
-
-IF(WITH_FFMPEG)
-       SET(INC ${INC} ${FFMPEG_INC})
-       ADD_DEFINITIONS(-DWITH_FFMPEG)
-ENDIF(WITH_FFMPEG)
-
-IF(WITH_OPENMP)
-               ADD_DEFINITIONS(-DPARALLEL=1)
-ENDIF(WITH_OPENMP)
-
-IF(NOT WITH_ELBEEM)
-       ADD_DEFINITIONS(-DDISABLE_ELBEEM)
-ENDIF(NOT WITH_ELBEEM)
-
-IF(WITH_PYTHON)
-       SET(INC ${INC} ${PYTHON_INC})
-ELSE(WITH_PYTHON)
-       ADD_DEFINITIONS(-DDISABLE_PYTHON)
-ENDIF(WITH_PYTHON)
-
 IF(WIN32)
        SET(INC ${INC} ${PTHREADS_INC})
 ENDIF(WIN32)
 
-IF(WITH_BUILDINFO)
-       ADD_DEFINITIONS(-DNAN_BUILDINFO)
-ENDIF(WITH_BUILDINFO)
-
 BLENDERLIB(bf_editor_space_image "${SRC}" "${INC}")
index ccdf6dfd1ca3c4b52add4349c9148104d31d3df2..aa9a40ac98f8fb77d65d4ea6b302c641025f4f27 100644 (file)
 # 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
+       ../../blenkernel
+       ../../blenlib
+       ../../imbuf
+       ../include
        ../../../../intern/guardedalloc
-       ../../../../intern/memutil
-       ../../blenlib ../../makesdna
-       ../../makesrna ../../blenkernel
-       ../../include ../../imbuf
-       ../../render/extern/include
-       ../../../../intern/bsp/extern
-       ../../../../intern/decimation/extern
-       ../../blenloader
-       ../../python
-       ../../../kernel/gen_system
-       ../../readstreamglue
-       ../../../../intern/elbeem/extern
-       ../../../../intern/ghost
-       ../../../../intern/opennl/extern
-       ../../../../extern/glew/include
-       ../../../../intern/smoke/extern
-       ../../../../intern/audaspace/intern
-       ../../nodes
-       ../../gpu
-       ../../blenfont
-       ../../ikplugin
+       ../../makesdna
+       ../../makesrna
+       ../../windowmanager
 )
 
-ADD_DEFINITIONS(-DGLEW_STATIC)
-
-IF(WITH_GAMEENGINE)
-       ADD_DEFINITIONS(-DGAMEBLENDER)
-ENDIF(WITH_GAMEENGINE)
-
-IF(WITH_INTERNATIONAL)
-       ADD_DEFINITIONS(-DINTERNATIONAL)
-ENDIF(WITH_INTERNATIONAL)
-
-IF(WITH_OPENEXR)
-       ADD_DEFINITIONS(-DWITH_OPENEXR)
-ENDIF(WITH_OPENEXR)
-
-IF(WITH_TIFF)
-       ADD_DEFINITIONS(-DWITH_TIFF)
-ENDIF(WITH_TIFF)
-
-IF(WITH_OPENJPEG)
-       ADD_DEFINITIONS(-DWITH_OPENJPEG)
-ENDIF(WITH_OPENJPEG)
-
-IF(WITH_QUICKTIME)
-       SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
-       ADD_DEFINITIONS(-DWITH_QUICKTIME)
-ENDIF(WITH_QUICKTIME)
-
-IF(WITH_FFMPEG)
-       SET(INC ${INC} ${FFMPEG_INC})
-       ADD_DEFINITIONS(-DWITH_FFMPEG)
-ENDIF(WITH_FFMPEG)
-
-IF(WITH_OPENMP)
-               ADD_DEFINITIONS(-DPARALLEL=1)
-ENDIF(WITH_OPENMP)
-
-IF(NOT WITH_ELBEEM)
-       ADD_DEFINITIONS(-DDISABLE_ELBEEM)
-ENDIF(NOT WITH_ELBEEM)
-
-IF(WITH_PYTHON)
-       SET(INC ${INC} ${PYTHON_INC})
-ELSE(WITH_PYTHON)
-       ADD_DEFINITIONS(-DDISABLE_PYTHON)
-ENDIF(WITH_PYTHON)
-
-IF(WIN32)
-       SET(INC ${INC} ${PTHREADS_INC})
-ENDIF(WIN32)
-
-IF(WITH_BUILDINFO)
-       ADD_DEFINITIONS(-DNAN_BUILDINFO)
-ENDIF(WITH_BUILDINFO)
-
 BLENDERLIB(bf_editor_space_info "${SRC}" "${INC}")
index 01268115687d918d0b7363dba5bad9334d1240da..417b9c7d96216a140ce804aafa1543d018aeccac 100644 (file)
@@ -8,7 +8,4 @@ incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
 
 defs = []
 
-if env['WITH_BF_GAMEENGINE']:
-       defs.append('GAMEBLENDER=1')
-
 env.BlenderLib ( 'bf_editors_space_info', sources, Split(incs), defs, libtype=['core'], priority=[70] )
index 5c3902d141c13a90d61cc4a53614ad80ea47badb..d559a5c6f17db89e13291d90b21e064ee2d7f1ba 100644 (file)
 FILE(GLOB SRC *.c)
 
 SET(INC
+       ../../blenkernel
+       ../../blenlib
+       ../include
+       ../../../../intern/guardedalloc
+       ../../makesdna
+       ../../makesrna
        ../../windowmanager
-       ../../editors/include
        ../../editors/interface
-       ../../../../intern/guardedalloc
-       ../../../../intern/memutil
-       ../../blenlib ../../makesdna
-       ../../makesrna ../../blenkernel
-       ../../include ../../imbuf
-       ../../render/extern/include
-       ../../../../intern/bsp/extern
-       ../../../../intern/decimation/extern
-       ../../blenloader
-       ../../python
-       ../../../kernel/gen_system
-       ../../readstreamglue
-       ../../../../intern/elbeem/extern
-       ../../../../intern/ghost
-       ../../../../intern/opennl/extern
-       ../../../../extern/glew/include
-       ../../../../intern/smoke/extern
-       ../../../../intern/audaspace/intern
-       ../../nodes
-       ../../gpu
-       ../../blenfont
-       ../../ikplugin
 )
 
-ADD_DEFINITIONS(-DGLEW_STATIC)
-
 IF(WITH_GAMEENGINE)
        ADD_DEFINITIONS(-DGAMEBLENDER)
 ENDIF(WITH_GAMEENGINE)
 
-IF(WITH_INTERNATIONAL)
-       ADD_DEFINITIONS(-DINTERNATIONAL)
-ENDIF(WITH_INTERNATIONAL)
-
-IF(WITH_OPENEXR)
-       ADD_DEFINITIONS(-DWITH_OPENEXR)
-ENDIF(WITH_OPENEXR)
-
-IF(WITH_TIFF)
-       ADD_DEFINITIONS(-DWITH_TIFF)
-ENDIF(WITH_TIFF)
-
-IF(WITH_OPENJPEG)
-       ADD_DEFINITIONS(-DWITH_OPENJPEG)
-ENDIF(WITH_OPENJPEG)
-
-IF(WITH_QUICKTIME)
-       SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
-       ADD_DEFINITIONS(-DWITH_QUICKTIME)
-ENDIF(WITH_QUICKTIME)
-
-IF(WITH_FFMPEG)
-       SET(INC ${INC} ${FFMPEG_INC})
-       ADD_DEFINITIONS(-DWITH_FFMPEG)
-ENDIF(WITH_FFMPEG)
-
-IF(WITH_OPENMP)
-               ADD_DEFINITIONS(-DPARALLEL=1)
-ENDIF(WITH_OPENMP)
-
-IF(NOT WITH_ELBEEM)
-       ADD_DEFINITIONS(-DDISABLE_ELBEEM)
-ENDIF(NOT WITH_ELBEEM)
-
-IF(WITH_PYTHON)
-       SET(INC ${INC} ${PYTHON_INC})
-ELSE(WITH_PYTHON)
-       ADD_DEFINITIONS(-DDISABLE_PYTHON)
-ENDIF(WITH_PYTHON)
-
-IF(WIN32)
-       SET(INC ${INC} ${PTHREADS_INC})
-ENDIF(WIN32)
-
-IF(WITH_BUILDINFO)
-       ADD_DEFINITIONS(-DNAN_BUILDINFO)
-ENDIF(WITH_BUILDINFO)
-
 BLENDERLIB(bf_editor_space_logic "${SRC}" "${INC}")
index 0e4166a9e1eac17e71843180e0ea82b515d767c8..67b39b1589b817d50a18ee65b77bdc5deeb81817 100644 (file)
 FILE(GLOB SRC *.c)
 
 SET(INC
-       ../../windowmanager
-       ../../editors/include
-       ../../editors/interface
+       ../../blenkernel
+       ../../blenlib
+       ../include
        ../../../../intern/guardedalloc
-       ../../../../intern/memutil
-       ../../blenlib ../../makesdna
-       ../../makesrna ../../blenkernel
-       ../../include ../../imbuf
-       ../../render/extern/include
-       ../../../../intern/bsp/extern
-       ../../../../intern/decimation/extern
-       ../../blenloader
-       ../../python
-       ../../../kernel/gen_system
-       ../../readstreamglue
-       ../../../../intern/elbeem/extern
-       ../../../../intern/ghost
-       ../../../../intern/opennl/extern
-       ../../../../extern/glew/include
-       ../../../../intern/smoke/extern
-       ../../../../intern/audaspace/intern
-       ../../nodes
-       ../../gpu
-       ../../blenfont
-       ../../ikplugin
+       ../../makesdna
+       ../../makesrna
+       ../../windowmanager
 )
 
-ADD_DEFINITIONS(-DGLEW_STATIC)
-
-IF(WITH_GAMEENGINE)
-       ADD_DEFINITIONS(-DGAMEBLENDER)
-ENDIF(WITH_GAMEENGINE)
-
-IF(WITH_INTERNATIONAL)
-       ADD_DEFINITIONS(-DINTERNATIONAL)
-ENDIF(WITH_INTERNATIONAL)
-
-IF(WITH_OPENEXR)
-       ADD_DEFINITIONS(-DWITH_OPENEXR)
-ENDIF(WITH_OPENEXR)
-
-IF(WITH_TIFF)
-       ADD_DEFINITIONS(-DWITH_TIFF)
-ENDIF(WITH_TIFF)
-
-IF(WITH_OPENJPEG)
-       ADD_DEFINITIONS(-DWITH_OPENJPEG)
-ENDIF(WITH_OPENJPEG)
-
-IF(WITH_QUICKTIME)
-       SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
-       ADD_DEFINITIONS(-DWITH_QUICKTIME)
-ENDIF(WITH_QUICKTIME)
-
-IF(WITH_FFMPEG)
-       SET(INC ${INC} ${FFMPEG_INC})
-       ADD_DEFINITIONS(-DWITH_FFMPEG)
-ENDIF(WITH_FFMPEG)
-
-IF(WITH_OPENMP)
-               ADD_DEFINITIONS(-DPARALLEL=1)
-ENDIF(WITH_OPENMP)
-
-IF(NOT WITH_ELBEEM)
-       ADD_DEFINITIONS(-DDISABLE_ELBEEM)
-ENDIF(NOT WITH_ELBEEM)
-
-IF(WITH_PYTHON)
-       SET(INC ${INC} ${PYTHON_INC})
-ELSE(WITH_PYTHON)
-       ADD_DEFINITIONS(-DDISABLE_PYTHON)
-ENDIF(WITH_PYTHON)
-
-IF(WIN32)
-       SET(INC ${INC} ${PTHREADS_INC})
-ENDIF(WIN32)
-
-IF(WITH_BUILDINFO)
-       ADD_DEFINITIONS(-DNAN_BUILDINFO)
-ENDIF(WITH_BUILDINFO)
-
 BLENDERLIB(bf_editor_space_nla "${SRC}" "${INC}")
index fd1dbfbe60d60b84191f1f06e3836ca00f31addb..0c8f9fc1ee2051a7749862781f1ffed03963ab2d 100644 (file)
 # 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
+       ../../blenkernel
+       ../../blenlib
+       ../../imbuf
+       ../include
        ../../../../intern/guardedalloc
-       ../../../../intern/memutil
-       ../../blenlib ../../makesdna
-       ../../makesrna ../../blenkernel
-       ../../include ../../imbuf
-       ../../render/extern/include
-       ../../../../intern/bsp/extern
-       ../../../../intern/decimation/extern
-       ../../blenloader
-       ../../python
-       ../../../kernel/gen_system
-       ../../readstreamglue
-       ../../../../intern/elbeem/extern
-       ../../../../intern/ghost
        ../../../../intern/opennl/extern
-       ../../../../extern/glew/include
-       ../../../../intern/smoke/extern
-       ../../../../intern/audaspace/intern
+       ../../makesdna
+       ../../makesrna
        ../../nodes
-       ../../gpu
-       ../../blenfont
-       ../../ikplugin
+       ../../render/extern/include
+       ../../windowmanager
 )
 
-ADD_DEFINITIONS(-DGLEW_STATIC)
-
-IF(WITH_GAMEENGINE)
-       ADD_DEFINITIONS(-DGAMEBLENDER)
-ENDIF(WITH_GAMEENGINE)
-
-IF(WITH_INTERNATIONAL)
-       ADD_DEFINITIONS(-DINTERNATIONAL)
-ENDIF(WITH_INTERNATIONAL)
-
-IF(WITH_OPENEXR)
-       ADD_DEFINITIONS(-DWITH_OPENEXR)
-ENDIF(WITH_OPENEXR)
-
-IF(WITH_TIFF)
-       ADD_DEFINITIONS(-DWITH_TIFF)
-ENDIF(WITH_TIFF)
-
-IF(WITH_OPENJPEG)
-       ADD_DEFINITIONS(-DWITH_OPENJPEG)
-ENDIF(WITH_OPENJPEG)
-
-IF(WITH_QUICKTIME)
-       SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
-       ADD_DEFINITIONS(-DWITH_QUICKTIME)
-ENDIF(WITH_QUICKTIME)
-
-IF(WITH_FFMPEG)
-       SET(INC ${INC} ${FFMPEG_INC})
-       ADD_DEFINITIONS(-DWITH_FFMPEG)
-ENDIF(WITH_FFMPEG)
-
-IF(WITH_OPENMP)
-               ADD_DEFINITIONS(-DPARALLEL=1)
-ENDIF(WITH_OPENMP)
-
-IF(NOT WITH_ELBEEM)
-       ADD_DEFINITIONS(-DDISABLE_ELBEEM)
-ENDIF(NOT WITH_ELBEEM)
-
-IF(WITH_PYTHON)
-       SET(INC ${INC} ${PYTHON_INC})
-ELSE(WITH_PYTHON)
-       ADD_DEFINITIONS(-DDISABLE_PYTHON)
-ENDIF(WITH_PYTHON)
-
 IF(WIN32)
        SET(INC ${INC} ${PTHREADS_INC})
 ENDIF(WIN32)
 
-IF(WITH_BUILDINFO)
-       ADD_DEFINITIONS(-DNAN_BUILDINFO)
-ENDIF(WITH_BUILDINFO)
-
 BLENDERLIB(bf_editor_space_node "${SRC}" "${INC}")
index fd1e1b2b8c90bb92af63ad0767562a218b52b370..8be645cb324f418085fd9435374723a89117e33c 100644 (file)
 FILE(GLOB SRC *.c)
 
 SET(INC
-       ../../windowmanager
-       ../../editors/include
-       ../../editors/interface
+       ../../blenkernel
+       ../../blenlib
+       ../../imbuf
+       ../include
        ../../../../intern/guardedalloc
-       ../../../../intern/memutil
-       ../../blenlib ../../makesdna
-       ../../makesrna ../../blenkernel
-       ../../include ../../imbuf
-       ../../render/extern/include
-       ../../../../intern/bsp/extern
-       ../../../../intern/decimation/extern
-       ../../blenloader
-       ../../python
-       ../../../kernel/gen_system
-       ../../readstreamglue
-       ../../../../intern/elbeem/extern
-       ../../../../intern/ghost
        ../../../../intern/opennl/extern
-       ../../../../extern/glew/include
-       ../../../../intern/smoke/extern
-       ../../../../intern/audaspace/intern
-       ../../nodes
-       ../../gpu
-       ../../blenfont
-       ../../ikplugin
+       ../../makesdna
+       ../../makesrna
+       ../../windowmanager
 )
 
-ADD_DEFINITIONS(-DGLEW_STATIC)
-
-IF(WITH_GAMEENGINE)
-       ADD_DEFINITIONS(-DGAMEBLENDER)
-ENDIF(WITH_GAMEENGINE)
-
-IF(WITH_INTERNATIONAL)
-       ADD_DEFINITIONS(-DINTERNATIONAL)
-ENDIF(WITH_INTERNATIONAL)
-
-IF(WITH_OPENEXR)
-       ADD_DEFINITIONS(-DWITH_OPENEXR)
-ENDIF(WITH_OPENEXR)
-
-IF(WITH_TIFF)
-       ADD_DEFINITIONS(-DWITH_TIFF)
-ENDIF(WITH_TIFF)
-
-IF(WITH_OPENJPEG)
-       ADD_DEFINITIONS(-DWITH_OPENJPEG)
-ENDIF(WITH_OPENJPEG)
-
-IF(WITH_QUICKTIME)
-       SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
-       ADD_DEFINITIONS(-DWITH_QUICKTIME)
-ENDIF(WITH_QUICKTIME)
-
-IF(WITH_FFMPEG)
-       SET(INC ${INC} ${FFMPEG_INC})
-       ADD_DEFINITIONS(-DWITH_FFMPEG)
-ENDIF(WITH_FFMPEG)
-
-IF(WITH_OPENMP)
-               ADD_DEFINITIONS(-DPARALLEL=1)
-ENDIF(WITH_OPENMP)
-
-IF(NOT WITH_ELBEEM)
-       ADD_DEFINITIONS(-DDISABLE_ELBEEM)
-ENDIF(NOT WITH_ELBEEM)
-
-IF(WITH_PYTHON)
-       SET(INC ${INC} ${PYTHON_INC})
-ELSE(WITH_PYTHON)
-       ADD_DEFINITIONS(-DDISABLE_PYTHON)
-ENDIF(WITH_PYTHON)
-
-IF(WIN32)
-       SET(INC ${INC} ${PTHREADS_INC})
-ENDIF(WIN32)
-
-IF(WITH_BUILDINFO)
-       ADD_DEFINITIONS(-DNAN_BUILDINFO)
-ENDIF(WITH_BUILDINFO)
-
 BLENDERLIB(bf_editor_space_outliner "${SRC}" "${INC}")
index ef39dc12f219547d60ac8a1765010020926aefac..6d93c17fc77ddc75d6292685be64baa3b374954b 100644 (file)
 FILE(GLOB SRC *.c)
 
 SET(INC
-       ../../windowmanager
-       ../../editors/include
-       ../../editors/interface
+       ../../blenkernel
+       ../../blenlib
+       ../include
        ../../../../intern/guardedalloc
-       ../../../../intern/memutil
-       ../../blenlib ../../makesdna
-       ../../makesrna ../../blenkernel
-       ../../include ../../imbuf
-       ../../render/extern/include
-       ../../../../intern/bsp/extern
-       ../../../../intern/decimation/extern
-       ../../blenloader
-       ../../python
-       ../../../kernel/gen_system
-       ../../readstreamglue
-       ../../../../intern/elbeem/extern
-       ../../../../intern/ghost
-       ../../../../intern/opennl/extern
-       ../../../../extern/glew/include
-       ../../../../intern/smoke/extern
-       ../../../../intern/audaspace/intern
-       ../../nodes
-       ../../gpu
-       ../../blenfont
-       ../../ikplugin
+       ../../makesdna
+       ../../makesrna
+       ../../windowmanager
 )
 
-ADD_DEFINITIONS(-DGLEW_STATIC)
-
-IF(WITH_GAMEENGINE)
-       ADD_DEFINITIONS(-DGAMEBLENDER)
-ENDIF(WITH_GAMEENGINE)
-
-IF(WITH_INTERNATIONAL)
-       ADD_DEFINITIONS(-DINTERNATIONAL)
-ENDIF(WITH_INTERNATIONAL)
-
-IF(WITH_OPENEXR)
-       ADD_DEFINITIONS(-DWITH_OPENEXR)
-ENDIF(WITH_OPENEXR)
-
-IF(WITH_TIFF)
-       ADD_DEFINITIONS(-DWITH_TIFF)
-ENDIF(WITH_TIFF)
-
-IF(WITH_OPENJPEG)
-       ADD_DEFINITIONS(-DWITH_OPENJPEG)
-ENDIF(WITH_OPENJPEG)
-
-IF(WITH_QUICKTIME)
-       SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
-       ADD_DEFINITIONS(-DWITH_QUICKTIME)
-ENDIF(WITH_QUICKTIME)
-
-IF(WITH_FFMPEG)
-       SET(INC ${INC} ${FFMPEG_INC})
-       ADD_DEFINITIONS(-DWITH_FFMPEG)
-ENDIF(WITH_FFMPEG)
-
-IF(WITH_OPENMP)
-               ADD_DEFINITIONS(-DPARALLEL=1)
-ENDIF(WITH_OPENMP)
-
-IF(NOT WITH_ELBEEM)
-       ADD_DEFINITIONS(-DDISABLE_ELBEEM)
-ENDIF(NOT WITH_ELBEEM)
-
 IF(WITH_PYTHON)
-       SET(INC ${INC} ${PYTHON_INC})
+       SET(INC ${INC} ${PYTHON_INC} ../../python)
 ELSE(WITH_PYTHON)
        ADD_DEFINITIONS(-DDISABLE_PYTHON)
 ENDIF(WITH_PYTHON)
 
-IF(WIN32)
-       SET(INC ${INC} ${PTHREADS_INC})
-ENDIF(WIN32)
-
-IF(WITH_BUILDINFO)
-       ADD_DEFINITIONS(-DNAN_BUILDINFO)
-ENDIF(WITH_BUILDINFO)
-
 BLENDERLIB(bf_editor_space_script "${SRC}" "${INC}")
index db4b9e09585bbaf4c92f8a5901533a6de51987be..cd0c4eb839cb22d0d5099a7c8d7e240b557f9752 100644 (file)
 FILE(GLOB SRC *.c)
 
 SET(INC
-       ../../windowmanager
-       ../../editors/include
-       ../../editors/interface
+       ../../blenkernel
+       ../../blenlib
+       ../../imbuf
+       ../include
        ../../../../intern/guardedalloc
-       ../../../../intern/memutil
-       ../../blenlib ../../makesdna
-       ../../makesrna ../../blenkernel
-       ../../include ../../imbuf
-       ../../render/extern/include
-       ../../../../intern/bsp/extern
-       ../../../../intern/decimation/extern
-       ../../blenloader
-       ../../python
-       ../../../kernel/gen_system
-       ../../readstreamglue
-       ../../../../intern/elbeem/extern
-       ../../../../intern/ghost
-       ../../../../intern/opennl/extern
-       ../../../../extern/glew/include
-       ../../../../intern/smoke/extern
+       ../../makesdna
+       ../../makesrna
+       ../../windowmanager
        ../../../../intern/audaspace/intern
-       ../../nodes
-       ../../gpu
-       ../../blenfont
-       ../../ikplugin
 )
 
-ADD_DEFINITIONS(-DGLEW_STATIC)
-
-IF(WITH_GAMEENGINE)
-       ADD_DEFINITIONS(-DGAMEBLENDER)
-ENDIF(WITH_GAMEENGINE)
-
-IF(WITH_INTERNATIONAL)
-       ADD_DEFINITIONS(-DINTERNATIONAL)
-ENDIF(WITH_INTERNATIONAL)
-
-IF(WITH_OPENEXR)
-       ADD_DEFINITIONS(-DWITH_OPENEXR)
-ENDIF(WITH_OPENEXR)
-
-IF(WITH_TIFF)
-       ADD_DEFINITIONS(-DWITH_TIFF)
-ENDIF(WITH_TIFF)
-
-IF(WITH_OPENJPEG)
-       ADD_DEFINITIONS(-DWITH_OPENJPEG)
-ENDIF(WITH_OPENJPEG)
-
-IF(WITH_QUICKTIME)
-       SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
-       ADD_DEFINITIONS(-DWITH_QUICKTIME)
-ENDIF(WITH_QUICKTIME)
-
-IF(WITH_FFMPEG)
-       SET(INC ${INC} ${FFMPEG_INC})
-       ADD_DEFINITIONS(-DWITH_FFMPEG)
-ENDIF(WITH_FFMPEG)
-
-IF(WITH_OPENMP)
-               ADD_DEFINITIONS(-DPARALLEL=1)
-ENDIF(WITH_OPENMP)
-
-IF(NOT WITH_ELBEEM)
-       ADD_DEFINITIONS(-DDISABLE_ELBEEM)
-ENDIF(NOT WITH_ELBEEM)
-
-IF(WITH_PYTHON)
-       SET(INC ${INC} ${PYTHON_INC})
-ELSE(WITH_PYTHON)
-       ADD_DEFINITIONS(-DDISABLE_PYTHON)
-ENDIF(WITH_PYTHON)
-
-IF(WIN32)
-       SET(INC ${INC} ${PTHREADS_INC})
-ENDIF(WIN32)
-
-IF(WITH_BUILDINFO)
-       ADD_DEFINITIONS(-DNAN_BUILDINFO)
-ENDIF(WITH_BUILDINFO)
-
 BLENDERLIB(bf_editor_space_sequencer "${SRC}" "${INC}")
index 500b461c260ce56e4068a3bf11ead51316d0b6ed..60c8f5e44bde36d52f6bb9c5e4a2470a6ef1ff17 100644 (file)
 # 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
+       ../../blenkernel
+       ../../blenlib
+       ../include
        ../../../../intern/guardedalloc
-       ../../../../intern/memutil
-       ../../blenlib ../../makesdna
-       ../../makesrna ../../blenkernel
-       ../../include ../../imbuf
-       ../../render/extern/include
-       ../../../../intern/bsp/extern
-       ../../../../intern/decimation/extern
-       ../../blenloader
-       ../../python
-       ../../../kernel/gen_system
-       ../../readstreamglue
-       ../../../../intern/elbeem/extern
-       ../../../../intern/ghost
-       ../../../../intern/opennl/extern
-       ../../../../extern/glew/include
-       ../../../../intern/smoke/extern
-       ../../../../intern/audaspace/intern
-       ../../nodes
-       ../../gpu
-       ../../blenfont
-       ../../ikplugin
+       ../../makesdna
+       ../../makesrna
+       ../../windowmanager
 )
 
-ADD_DEFINITIONS(-DGLEW_STATIC)
-
-IF(WITH_GAMEENGINE)
-       ADD_DEFINITIONS(-DGAMEBLENDER)
-ENDIF(WITH_GAMEENGINE)
-
-IF(WITH_INTERNATIONAL)
-       ADD_DEFINITIONS(-DINTERNATIONAL)
-ENDIF(WITH_INTERNATIONAL)
-
-IF(WITH_OPENEXR)
-       ADD_DEFINITIONS(-DWITH_OPENEXR)
-ENDIF(WITH_OPENEXR)
-
-IF(WITH_TIFF)
-       ADD_DEFINITIONS(-DWITH_TIFF)
-ENDIF(WITH_TIFF)
-
-IF(WITH_OPENJPEG)
-       ADD_DEFINITIONS(-DWITH_OPENJPEG)
-ENDIF(WITH_OPENJPEG)
-
-IF(WITH_QUICKTIME)
-       SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
-       ADD_DEFINITIONS(-DWITH_QUICKTIME)
-ENDIF(WITH_QUICKTIME)
-
-IF(WITH_FFMPEG)
-       SET(INC ${INC} ${FFMPEG_INC})
-       ADD_DEFINITIONS(-DWITH_FFMPEG)
-ENDIF(WITH_FFMPEG)
-
-IF(WITH_OPENMP)
-               ADD_DEFINITIONS(-DPARALLEL=1)
-ENDIF(WITH_OPENMP)
-
-IF(NOT WITH_ELBEEM)
-       ADD_DEFINITIONS(-DDISABLE_ELBEEM)
-ENDIF(NOT WITH_ELBEEM)
-
-IF(WITH_PYTHON)
-       SET(INC ${INC} ${PYTHON_INC})
-ELSE(WITH_PYTHON)
-       ADD_DEFINITIONS(-DDISABLE_PYTHON)
-ENDIF(WITH_PYTHON)
-
-IF(WIN32)
-       SET(INC ${INC} ${PTHREADS_INC})
-ENDIF(WIN32)
-
-IF(WITH_BUILDINFO)
-       ADD_DEFINITIONS(-DNAN_BUILDINFO)
-ENDIF(WITH_BUILDINFO)
-
 BLENDERLIB(bf_editor_space_sound "${SRC}" "${INC}")
index d694661460f6b508b8ce29337580956e9b1ef22d..3e89cdb1770193004e245cae8ae86482c7dca07a 100644 (file)
 FILE(GLOB SRC *.c)
 
 SET(INC
-       ../../windowmanager
-       ../../editors/include
-       ../../editors/interface
-       ../../../../intern/guardedalloc
-       ../../../../intern/memutil
-       ../../blenlib ../../makesdna
-       ../../makesrna ../../blenkernel
-       ../../include ../../imbuf
-       ../../render/extern/include
-       ../../../../intern/bsp/extern
-       ../../../../intern/decimation/extern
-       ../../blenloader
-       ../../python
-       ../../../kernel/gen_system
-       ../../readstreamglue
-       ../../../../intern/elbeem/extern
-       ../../../../intern/ghost
-       ../../../../intern/opennl/extern
-       ../../../../extern/glew/include
-       ../../../../intern/smoke/extern
-       ../../../../intern/audaspace/intern
-       ../../nodes
-       ../../gpu
        ../../blenfont
-       ../../ikplugin
+       ../../blenkernel
+       ../../blenlib
+       ../include
+       ../../../../intern/guardedalloc
+       ../../makesdna
+       ../../makesrna
+       ../../windowmanager
 )
 
-ADD_DEFINITIONS(-DGLEW_STATIC)
-
-IF(WITH_GAMEENGINE)
-       ADD_DEFINITIONS(-DGAMEBLENDER)
-ENDIF(WITH_GAMEENGINE)
-
-IF(WITH_INTERNATIONAL)
-       ADD_DEFINITIONS(-DINTERNATIONAL)
-ENDIF(WITH_INTERNATIONAL)
-
-IF(WITH_OPENEXR)
-       ADD_DEFINITIONS(-DWITH_OPENEXR)
-ENDIF(WITH_OPENEXR)
-
-IF(WITH_TIFF)
-       ADD_DEFINITIONS(-DWITH_TIFF)
-ENDIF(WITH_TIFF)
-
-IF(WITH_OPENJPEG)
-       ADD_DEFINITIONS(-DWITH_OPENJPEG)
-ENDIF(WITH_OPENJPEG)
-
-IF(WITH_QUICKTIME)
-       SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
-       ADD_DEFINITIONS(-DWITH_QUICKTIME)
-ENDIF(WITH_QUICKTIME)
-
-IF(WITH_FFMPEG)
-       SET(INC ${INC} ${FFMPEG_INC})
-       ADD_DEFINITIONS(-DWITH_FFMPEG)
-ENDIF(WITH_FFMPEG)
-
-IF(WITH_OPENMP)
-               ADD_DEFINITIONS(-DPARALLEL=1)
-ENDIF(WITH_OPENMP)
-
-IF(NOT WITH_ELBEEM)
-       ADD_DEFINITIONS(-DDISABLE_ELBEEM)
-ENDIF(NOT WITH_ELBEEM)
-
 IF(WITH_PYTHON)
-       SET(INC ${INC} ${PYTHON_INC})
+       SET(INC ${INC} ${PYTHON_INC} ../../python)
 ELSE(WITH_PYTHON)
        ADD_DEFINITIONS(-DDISABLE_PYTHON)
 ENDIF(WITH_PYTHON)
 
-IF(WIN32)
-       SET(INC ${INC} ${PTHREADS_INC})
-ENDIF(WIN32)
-
-IF(WITH_BUILDINFO)
-       ADD_DEFINITIONS(-DNAN_BUILDINFO)
-ENDIF(WITH_BUILDINFO)
-
 BLENDERLIB(bf_editor_text "${SRC}" "${INC}")
index 31502fff955d19d1a073261413f4fa60efb930d6..39b7ba355b95e0e5d3268dc9923f72ad00d97fb7 100644 (file)
 # 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
+       ../../blenkernel
+       ../../blenlib
+       ../include
        ../../../../intern/guardedalloc
-       ../../../../intern/memutil
-       ../../blenlib ../../makesdna
-       ../../makesrna ../../blenkernel
-       ../../include ../../imbuf
-       ../../render/extern/include
-       ../../../../intern/bsp/extern
-       ../../../../intern/decimation/extern
-       ../../blenloader
-       ../../python
-       ../../../kernel/gen_system
-       ../../readstreamglue
-       ../../../../intern/elbeem/extern
-       ../../../../intern/ghost
-       ../../../../intern/opennl/extern
-       ../../../../extern/glew/include
-       ../../../../intern/smoke/extern
-       ../../../../intern/audaspace/intern
-       ../../nodes
-       ../../gpu
-       ../../blenfont
-       ../../ikplugin
+       ../../makesdna
+       ../../makesrna
+       ../../windowmanager
 )
 
-ADD_DEFINITIONS(-DGLEW_STATIC)
-
-IF(WITH_GAMEENGINE)
-       ADD_DEFINITIONS(-DGAMEBLENDER)
-ENDIF(WITH_GAMEENGINE)
-
-IF(WITH_INTERNATIONAL)
-       ADD_DEFINITIONS(-DINTERNATIONAL)
-ENDIF(WITH_INTERNATIONAL)
-
-IF(WITH_OPENEXR)
-       ADD_DEFINITIONS(-DWITH_OPENEXR)
-ENDIF(WITH_OPENEXR)
-
-IF(WITH_TIFF)
-       ADD_DEFINITIONS(-DWITH_TIFF)
-ENDIF(WITH_TIFF)
-
-IF(WITH_OPENJPEG)
-       ADD_DEFINITIONS(-DWITH_OPENJPEG)
-ENDIF(WITH_OPENJPEG)
-
-IF(WITH_QUICKTIME)
-       SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
-       ADD_DEFINITIONS(-DWITH_QUICKTIME)
-ENDIF(WITH_QUICKTIME)
-
-IF(WITH_FFMPEG)
-       SET(INC ${INC} ${FFMPEG_INC})
-       ADD_DEFINITIONS(-DWITH_FFMPEG)
-ENDIF(WITH_FFMPEG)
-
-IF(WITH_OPENMP)
-               ADD_DEFINITIONS(-DPARALLEL=1)
-ENDIF(WITH_OPENMP)
-
-IF(NOT WITH_ELBEEM)
-       ADD_DEFINITIONS(-DDISABLE_ELBEEM)
-ENDIF(NOT WITH_ELBEEM)
-
-IF(WITH_PYTHON)
-       SET(INC ${INC} ${PYTHON_INC})
-ELSE(WITH_PYTHON)
-       ADD_DEFINITIONS(-DDISABLE_PYTHON)
-ENDIF(WITH_PYTHON)
-
-IF(WIN32)
-       SET(INC ${INC} ${PTHREADS_INC})
-ENDIF(WIN32)
-
-IF(WITH_BUILDINFO)
-       ADD_DEFINITIONS(-DNAN_BUILDINFO)
-ENDIF(WITH_BUILDINFO)
-
 BLENDERLIB(bf_editor_space_time "${SRC}" "${INC}")
index cb41001b106223899329c05d810d99337dbbacd0..1752f39cfa59d91037c599df867f5c350c7c4585 100644 (file)
 # 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
+       ../include
+       ../../blenkernel
+       ../../blenlib
        ../../../../intern/guardedalloc
-       ../../../../intern/memutil
-       ../../blenlib ../../makesdna
-       ../../makesrna ../../blenkernel
-       ../../include ../../imbuf
-       ../../render/extern/include
-       ../../../../intern/bsp/extern
-       ../../../../intern/decimation/extern
-       ../../blenloader
-       ../../python
-       ../../../kernel/gen_system
-       ../../readstreamglue
-       ../../../../intern/elbeem/extern
-       ../../../../intern/ghost
-       ../../../../intern/opennl/extern
-       ../../../../extern/glew/include
-       ../../../../intern/smoke/extern
-       ../../../../intern/audaspace/intern
-       ../../nodes
-       ../../gpu
-       ../../blenfont
-       ../../ikplugin
+       ../../makesdna
+       ../../makesrna
+       ../../windowmanager
 )
 
-ADD_DEFINITIONS(-DGLEW_STATIC)
-
-IF(WITH_GAMEENGINE)
-       ADD_DEFINITIONS(-DGAMEBLENDER)
-ENDIF(WITH_GAMEENGINE)
-
-IF(WITH_INTERNATIONAL)
-       ADD_DEFINITIONS(-DINTERNATIONAL)
-ENDIF(WITH_INTERNATIONAL)
-
-IF(WITH_OPENEXR)
-       ADD_DEFINITIONS(-DWITH_OPENEXR)
-ENDIF(WITH_OPENEXR)
-
-IF(WITH_TIFF)
-       ADD_DEFINITIONS(-DWITH_TIFF)
-ENDIF(WITH_TIFF)
-
-IF(WITH_OPENJPEG)
-       ADD_DEFINITIONS(-DWITH_OPENJPEG)
-ENDIF(WITH_OPENJPEG)
-
-IF(WITH_QUICKTIME)
-       SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
-       ADD_DEFINITIONS(-DWITH_QUICKTIME)
-ENDIF(WITH_QUICKTIME)
-
-IF(WITH_FFMPEG)
-       SET(INC ${INC} ${FFMPEG_INC})
-       ADD_DEFINITIONS(-DWITH_FFMPEG)
-ENDIF(WITH_FFMPEG)
-
-IF(WITH_OPENMP)
-               ADD_DEFINITIONS(-DPARALLEL=1)
-ENDIF(WITH_OPENMP)
-
-IF(NOT WITH_ELBEEM)
-       ADD_DEFINITIONS(-DDISABLE_ELBEEM)
-ENDIF(NOT WITH_ELBEEM)
-
-IF(WITH_PYTHON)
-       SET(INC ${INC} ${PYTHON_INC})
-ELSE(WITH_PYTHON)
-       ADD_DEFINITIONS(-DDISABLE_PYTHON)
-ENDIF(WITH_PYTHON)
-
-IF(WIN32)
-       SET(INC ${INC} ${PTHREADS_INC})
-ENDIF(WIN32)
-
-IF(WITH_BUILDINFO)
-       ADD_DEFINITIONS(-DNAN_BUILDINFO)
-ENDIF(WITH_BUILDINFO)
-
 BLENDERLIB(bf_editor_space_userpref "${SRC}" "${INC}")
index 1b808a5a7c086d70afcf562b711fecd263f0cbcd..3ba1543b84045287103a56eec377e2d8a687fb4e 100644 (file)
@@ -8,7 +8,4 @@ incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
 
 defs = []
 
-if env['WITH_BF_GAMEENGINE']:
-       defs.append('GAMEBLENDER=1')
-
 env.BlenderLib ( 'bf_editors_space_userpref', sources, Split(incs), defs, libtype=['core'], priority=[70] )
index f17d5c0721600e44642e037786e814b3dbfcb027..20a45e34d84f42752e915e056d9eeff11cfd0552 100644 (file)
 # 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
+       ../include
+       ../../blenfont
+       ../../blenkernel
+       ../../blenlib
+       ../../gpu
+       ../../imbuf
        ../../../../intern/guardedalloc
-       ../../../../intern/memutil
-       ../../blenlib ../../makesdna
-       ../../makesrna ../../blenkernel
-       ../../include ../../imbuf
-       ../../render/extern/include
-       ../../../../intern/bsp/extern
-       ../../../../intern/decimation/extern
-       ../../blenloader
-       ../../python
-       ../../../kernel/gen_system
-       ../../readstreamglue
-       ../../../../intern/elbeem/extern
-       ../../../../intern/ghost
-       ../../../../intern/opennl/extern
-       ../../../../extern/glew/include
        ../../../../intern/smoke/extern
-       ../../../../intern/audaspace/intern
-       ../../nodes
-       ../../gpu
-       ../../blenfont
-       ../../ikplugin
+       ../../makesdna
+       ../../makesrna
+       ../../render/extern/include
+       ../../windowmanager
 )
 
-ADD_DEFINITIONS(-DGLEW_STATIC)
-
 IF(WITH_GAMEENGINE)
+       SET(INC ${INC} ../../../kernel/gen_system)
        ADD_DEFINITIONS(-DGAMEBLENDER)
 ENDIF(WITH_GAMEENGINE)
 
-IF(WITH_INTERNATIONAL)
-       ADD_DEFINITIONS(-DINTERNATIONAL)
-ENDIF(WITH_INTERNATIONAL)
-
-IF(WITH_OPENEXR)
-       ADD_DEFINITIONS(-DWITH_OPENEXR)
-ENDIF(WITH_OPENEXR)
-
-IF(WITH_TIFF)
-       ADD_DEFINITIONS(-DWITH_TIFF)
-ENDIF(WITH_TIFF)
-
-IF(WITH_OPENJPEG)
-       ADD_DEFINITIONS(-DWITH_OPENJPEG)
-ENDIF(WITH_OPENJPEG)
-
-IF(WITH_QUICKTIME)
-       SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
-       ADD_DEFINITIONS(-DWITH_QUICKTIME)
-ENDIF(WITH_QUICKTIME)
-
-IF(WITH_FFMPEG)
-       SET(INC ${INC} ${FFMPEG_INC})
-       ADD_DEFINITIONS(-DWITH_FFMPEG)
-ENDIF(WITH_FFMPEG)
-
-IF(WITH_OPENMP)
-               ADD_DEFINITIONS(-DPARALLEL=1)
-ENDIF(WITH_OPENMP)
-
-IF(NOT WITH_ELBEEM)
-       ADD_DEFINITIONS(-DDISABLE_ELBEEM)
-ENDIF(NOT WITH_ELBEEM)
-
-IF(WITH_PYTHON)
-       SET(INC ${INC} ${PYTHON_INC})
-ELSE(WITH_PYTHON)
-       ADD_DEFINITIONS(-DDISABLE_PYTHON)
-ENDIF(WITH_PYTHON)
-
 IF(WIN32)
        SET(INC ${INC} ${PTHREADS_INC})
 ENDIF(WIN32)
 
-IF(WITH_BUILDINFO)
-       ADD_DEFINITIONS(-DNAN_BUILDINFO)
-ENDIF(WITH_BUILDINFO)
-
 BLENDERLIB(bf_editor_space_view3d "${SRC}" "${INC}")
index 5ca527f7144a267f0412d274e4cbb8bede669c86..6f1bc69eb9f538a249fdf6a5516f8986efaba8ce 100644 (file)
 FILE(GLOB SRC *.c)
 
 SET(INC
-       ../../windowmanager
-       ../../editors/include
-       ../../editors/interface
+       ../../blenkernel
+       ../../blenlib
+       ../include
        ../../../../intern/guardedalloc
-       ../../../../intern/memutil
-       ../../blenlib ../../makesdna
-       ../../makesrna ../../blenkernel
-       ../../include ../../imbuf
-       ../../render/extern/include
-       ../../../../intern/bsp/extern
-       ../../../../intern/decimation/extern
-       ../../blenloader
-       ../../python
-       ../../../kernel/gen_system
-       ../../readstreamglue
-       ../../../../intern/elbeem/extern
-       ../../../../intern/ghost
-       ../../../../intern/opennl/extern
-       ../../../../extern/glew/include
-       ../../../../intern/smoke/extern
-       ../../../../intern/audaspace/intern
-       ../../nodes
-       ../../gpu
-       ../../blenfont
-       ../../ikplugin
+       ../../makesdna
+       ../../makesrna
+       ../../windowmanager
 )
 
-ADD_DEFINITIONS(-DGLEW_STATIC)
-
-IF(WITH_GAMEENGINE)
-       ADD_DEFINITIONS(-DGAMEBLENDER)
-ENDIF(WITH_GAMEENGINE)
-
-IF(WITH_INTERNATIONAL)
-       ADD_DEFINITIONS(-DINTERNATIONAL)
-ENDIF(WITH_INTERNATIONAL)
-
-IF(WITH_OPENEXR)
-       ADD_DEFINITIONS(-DWITH_OPENEXR)
-ENDIF(WITH_OPENEXR)
-
-IF(WITH_TIFF)
-       ADD_DEFINITIONS(-DWITH_TIFF)
-ENDIF(WITH_TIFF)
-
-IF(WITH_OPENJPEG)
-       ADD_DEFINITIONS(-DWITH_OPENJPEG)
-ENDIF(WITH_OPENJPEG)
-
-IF(WITH_QUICKTIME)
-       SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
-       ADD_DEFINITIONS(-DWITH_QUICKTIME)
-ENDIF(WITH_QUICKTIME)
-
-IF(WITH_FFMPEG)
-       SET(INC ${INC} ${FFMPEG_INC})
-       ADD_DEFINITIONS(-DWITH_FFMPEG)
-ENDIF(WITH_FFMPEG)
-
-IF(WITH_OPENMP)
-               ADD_DEFINITIONS(-DPARALLEL=1)
-ENDIF(WITH_OPENMP)
-
-IF(NOT WITH_ELBEEM)
-       ADD_DEFINITIONS(-DDISABLE_ELBEEM)
-ENDIF(NOT WITH_ELBEEM)
-
-IF(WITH_PYTHON)
-       SET(INC ${INC} ${PYTHON_INC})
-ELSE(WITH_PYTHON)
-       ADD_DEFINITIONS(-DDISABLE_PYTHON)
-ENDIF(WITH_PYTHON)
-
-IF(WIN32)
-       SET(INC ${INC} ${PTHREADS_INC})
-ENDIF(WIN32)
-
-IF(WITH_BUILDINFO)
-       ADD_DEFINITIONS(-DNAN_BUILDINFO)
-ENDIF(WITH_BUILDINFO)
-
 BLENDERLIB(bf_editor_transform "${SRC}" "${INC}")
index 5fcf465a63c3e4a0d391b6a8c5627c89c73e3bee..b4b2fd12cefc85dbf191f631dff3bf2782ad1d2e 100644 (file)
 # 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
+       ../../blenkernel
+       ../../blenlib
+       ../include
        ../../../../intern/guardedalloc
-       ../../../../intern/memutil
-       ../../blenlib ../../makesdna
-       ../../makesrna ../../blenkernel
-       ../../include ../../imbuf
-       ../../render/extern/include
-       ../../../../intern/bsp/extern
-       ../../../../intern/decimation/extern
-       ../../blenloader
-       ../../python
-       ../../../kernel/gen_system
-       ../../readstreamglue
-       ../../../../intern/elbeem/extern
-       ../../../../intern/ghost
-       ../../../../intern/opennl/extern
-       ../../../../extern/glew/include
-       ../../../../intern/smoke/extern
-       ../../../../intern/audaspace/intern
-       ../../nodes
-       ../../gpu
-       ../../blenfont
-       ../../ikplugin
+       ../../makesdna
+       ../../makesrna
+       ../../windowmanager
 )
 
-ADD_DEFINITIONS(-DGLEW_STATIC)
-
-IF(WITH_GAMEENGINE)
-       ADD_DEFINITIONS(-DGAMEBLENDER)
-ENDIF(WITH_GAMEENGINE)
-
-IF(WITH_INTERNATIONAL)
-       ADD_DEFINITIONS(-DINTERNATIONAL)
-ENDIF(WITH_INTERNATIONAL)
-
-IF(WITH_OPENEXR)
-       ADD_DEFINITIONS(-DWITH_OPENEXR)
-ENDIF(WITH_OPENEXR)
-
-IF(WITH_TIFF)
-       ADD_DEFINITIONS(-DWITH_TIFF)
-ENDIF(WITH_TIFF)
-
-IF(WITH_OPENJPEG)
-       ADD_DEFINITIONS(-DWITH_OPENJPEG)
-ENDIF(WITH_OPENJPEG)
-
-IF(WITH_QUICKTIME)
-       SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
-       ADD_DEFINITIONS(-DWITH_QUICKTIME)
-ENDIF(WITH_QUICKTIME)
-
-IF(WITH_FFMPEG)
-       SET(INC ${INC} ${FFMPEG_INC})
-       ADD_DEFINITIONS(-DWITH_FFMPEG)
-ENDIF(WITH_FFMPEG)
-
-IF(WITH_OPENMP)
-               ADD_DEFINITIONS(-DPARALLEL=1)
-ENDIF(WITH_OPENMP)
-
-IF(NOT WITH_ELBEEM)
-       ADD_DEFINITIONS(-DDISABLE_ELBEEM)
-ENDIF(NOT WITH_ELBEEM)
-
-IF(WITH_PYTHON)
-       SET(INC ${INC} ${PYTHON_INC})
-ELSE(WITH_PYTHON)
-       ADD_DEFINITIONS(-DDISABLE_PYTHON)
-ENDIF(WITH_PYTHON)
-
-IF(WIN32)
-       SET(INC ${INC} ${PTHREADS_INC})
-ENDIF(WIN32)
-
-IF(WITH_BUILDINFO)
-       ADD_DEFINITIONS(-DNAN_BUILDINFO)
-ENDIF(WITH_BUILDINFO)
-
 BLENDERLIB(bf_editor_util "${SRC}" "${INC}")
index ba38f3d74a899d271eeb93e28661b3e0a58ea9b8..297863b2a9f0a98ed7f7aeca6363c221699211a0 100644 (file)
 # 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
+       ../../blenkernel
+       ../../blenlib
+       ../include
        ../../../../intern/guardedalloc
-       ../../../../intern/memutil
-       ../../blenlib ../../makesdna
-       ../../makesrna ../../blenkernel
-       ../../include ../../imbuf
-       ../../render/extern/include
-       ../../../../intern/bsp/extern
-       ../../../../intern/decimation/extern
-       ../../blenloader
-       ../../python
-       ../../../kernel/gen_system
-       ../../readstreamglue
-       ../../../../intern/elbeem/extern
-       ../../../../intern/ghost
        ../../../../intern/opennl/extern
-       ../../../../extern/glew/include
-       ../../../../intern/smoke/extern
-       ../../../../intern/audaspace/intern
-       ../../nodes
-       ../../gpu
-       ../../blenfont
-       ../../ikplugin
+       ../../makesdna
+       ../../makesrna
+       ../../windowmanager
 )
 
-ADD_DEFINITIONS(-DGLEW_STATIC)
-
-IF(WITH_GAMEENGINE)
-       ADD_DEFINITIONS(-DGAMEBLENDER)
-ENDIF(WITH_GAMEENGINE)
-
-IF(WITH_INTERNATIONAL)
-       ADD_DEFINITIONS(-DINTERNATIONAL)
-ENDIF(WITH_INTERNATIONAL)
-
-IF(WITH_OPENEXR)
-       ADD_DEFINITIONS(-DWITH_OPENEXR)
-ENDIF(WITH_OPENEXR)
-
-IF(WITH_TIFF)
-       ADD_DEFINITIONS(-DWITH_TIFF)
-ENDIF(WITH_TIFF)
-
-IF(WITH_OPENJPEG)
-       ADD_DEFINITIONS(-DWITH_OPENJPEG)
-ENDIF(WITH_OPENJPEG)
-
-IF(WITH_QUICKTIME)
-       SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
-       ADD_DEFINITIONS(-DWITH_QUICKTIME)
-ENDIF(WITH_QUICKTIME)
-
-IF(WITH_FFMPEG)
-       SET(INC ${INC} ${FFMPEG_INC})
-       ADD_DEFINITIONS(-DWITH_FFMPEG)
-ENDIF(WITH_FFMPEG)
-
-IF(WITH_OPENMP)
-               ADD_DEFINITIONS(-DPARALLEL=1)
-ENDIF(WITH_OPENMP)
-
-IF(NOT WITH_ELBEEM)
-       ADD_DEFINITIONS(-DDISABLE_ELBEEM)
-ENDIF(NOT WITH_ELBEEM)
-
-IF(WITH_PYTHON)
-       SET(INC ${INC} ${PYTHON_INC})
-ELSE(WITH_PYTHON)
-       ADD_DEFINITIONS(-DDISABLE_PYTHON)
-ENDIF(WITH_PYTHON)
-
-IF(WIN32)
-       SET(INC ${INC} ${PTHREADS_INC})
-ENDIF(WIN32)
-
-IF(WITH_BUILDINFO)
-       ADD_DEFINITIONS(-DNAN_BUILDINFO)
-ENDIF(WITH_BUILDINFO)
-
 BLENDERLIB(bf_editor_uvedit "${SRC}" "${INC}")