Revision: 29251
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29251
Author: campbellbarton
Date: 2010-06-06 01:27:49 +0200 (Sun, 06 Jun 2010)
Log Message:
-----------
finish cleanup to cmake editors, also removed some stuff from scons thats not
needed.
Modified Paths:
--------------
trunk/blender/source/blender/editors/CMakeLists.txt
trunk/blender/source/blender/editors/animation/CMakeLists.txt
trunk/blender/source/blender/editors/armature/CMakeLists.txt
trunk/blender/source/blender/editors/curve/CMakeLists.txt
trunk/blender/source/blender/editors/datafiles/CMakeLists.txt
trunk/blender/source/blender/editors/gpencil/CMakeLists.txt
trunk/blender/source/blender/editors/interface/CMakeLists.txt
trunk/blender/source/blender/editors/mesh/CMakeLists.txt
trunk/blender/source/blender/editors/mesh/editmesh.c
trunk/blender/source/blender/editors/metaball/CMakeLists.txt
trunk/blender/source/blender/editors/object/CMakeLists.txt
trunk/blender/source/blender/editors/physics/CMakeLists.txt
trunk/blender/source/blender/editors/render/CMakeLists.txt
trunk/blender/source/blender/editors/screen/CMakeLists.txt
trunk/blender/source/blender/editors/screen/SConscript
trunk/blender/source/blender/editors/screen/area.c
trunk/blender/source/blender/editors/sculpt_paint/CMakeLists.txt
trunk/blender/source/blender/editors/sound/CMakeLists.txt
trunk/blender/source/blender/editors/sound/SConscript
trunk/blender/source/blender/editors/space_action/CMakeLists.txt
trunk/blender/source/blender/editors/space_api/CMakeLists.txt
trunk/blender/source/blender/editors/space_api/SConscript
trunk/blender/source/blender/editors/space_buttons/CMakeLists.txt
trunk/blender/source/blender/editors/space_buttons/SConscript
trunk/blender/source/blender/editors/space_console/CMakeLists.txt
trunk/blender/source/blender/editors/space_console/space_console.c
trunk/blender/source/blender/editors/space_file/CMakeLists.txt
trunk/blender/source/blender/editors/space_graph/CMakeLists.txt
trunk/blender/source/blender/editors/space_image/CMakeLists.txt
trunk/blender/source/blender/editors/space_logic/CMakeLists.txt
trunk/blender/source/blender/editors/space_nla/CMakeLists.txt
trunk/blender/source/blender/editors/space_outliner/CMakeLists.txt
trunk/blender/source/blender/editors/space_script/CMakeLists.txt
trunk/blender/source/blender/editors/space_sequencer/CMakeLists.txt
trunk/blender/source/blender/editors/space_text/CMakeLists.txt
trunk/blender/source/blender/editors/transform/CMakeLists.txt
Modified: trunk/blender/source/blender/editors/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/CMakeLists.txt 2010-06-05 21:19:59 UTC
(rev 29250)
+++ trunk/blender/source/blender/editors/CMakeLists.txt 2010-06-05 23:27:49 UTC
(rev 29251)
@@ -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 *****
Modified: trunk/blender/source/blender/editors/animation/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/animation/CMakeLists.txt
2010-06-05 21:19:59 UTC (rev 29250)
+++ trunk/blender/source/blender/editors/animation/CMakeLists.txt
2010-06-05 23:27:49 UTC (rev 29251)
@@ -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}")
Modified: trunk/blender/source/blender/editors/armature/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/armature/CMakeLists.txt
2010-06-05 21:19:59 UTC (rev 29250)
+++ trunk/blender/source/blender/editors/armature/CMakeLists.txt
2010-06-05 23:27:49 UTC (rev 29251)
@@ -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}")
Modified: trunk/blender/source/blender/editors/curve/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/curve/CMakeLists.txt 2010-06-05
21:19:59 UTC (rev 29250)
+++ trunk/blender/source/blender/editors/curve/CMakeLists.txt 2010-06-05
23:27:49 UTC (rev 29251)
@@ -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}")
Modified: trunk/blender/source/blender/editors/datafiles/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/datafiles/CMakeLists.txt
2010-06-05 21:19:59 UTC (rev 29250)
+++ trunk/blender/source/blender/editors/datafiles/CMakeLists.txt
2010-06-05 23:27:49 UTC (rev 29251)
@@ -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
-)
+SET(INC "")
-ADD_DEFINITIONS(-DGLEW_STATIC)
-
-IF(WITH_GAMEENGINE)
- ADD_DEFINITIONS(-DGAMEBLENDER)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
