9 files changed, 185 insertions, 7 deletions
diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt
index fa9199006a8..90b6ce70406 100644
--- a/source/blender/CMakeLists.txt
+++ b/source/blender/CMakeLists.txt
@@ -27,7 +27,7 @@
 #
 # ***** END GPL/BL DUAL LICENSE BLOCK *****
 
-SUBDIRS(avi nodes blenkernel blenlib blenloader blenpluginapi imbuf imbuf/intern/cineon makesdna python radiosity readblenfile render src yafray)
+SUBDIRS(windowmanager editors avi nodes blenkernel blenlib blenloader blenpluginapi imbuf imbuf/intern/cineon makesdna python radiosity readblenfile render yafray)
 
 IF(WITH_INTERNATIONAL)
   SUBDIRS(ftfont)
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index c0776583a04..994e5922a8d 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -35,7 +35,7 @@ SET(INC
   ../imbuf ../avi ../../../intern/elbeem/extern
   ../../../intern/iksolver/extern ../blenloader ../quicktime
   ../../../intern/bmfont
-  ../nodes
+  ../nodes ../editors/include
   ${SDL_INC}
   ${ZLIB_INC}
 )
diff --git a/source/blender/editors/CMakeLists.txt b/source/blender/editors/CMakeLists.txt
new file mode 100644
index 00000000000..8539db101e3
--- /dev/null
+++ b/source/blender/editors/CMakeLists.txt
@@ -0,0 +1,86 @@
+# $Id: CMakeLists.txt 12931 2007-12-17 18:20:48Z theeth $
+# ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version. The Blender
+# Foundation also sells licenses for use in proprietary software under
+# the Blender License.  See http://www.blender.org/BL/ for information
+# about this.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, 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/BL DUAL LICENSE BLOCK *****
+
+FILE(GLOB SRC */*.c)
+
+SET(INC ../windowmanager
+  ../editors/include
+  ../../../intern/guardedalloc ../../../intern/memutil
+  ../blenlib ../makesdna ../blenkernel
+  ../include ../../../intern/bmfont ../imbuf ../render/extern/include
+  ../../../intern/bsp/extern ../radiosity/extern/include
+  ../../../intern/decimation/extern ../blenloader ../python
+  ../../kernel/gen_system ../../../intern/SoundSystem ../readstreamglue
+  ../quicktime ../../../intern/elbeem/extern
+  ../../../intern/ghost ../../../intern/opennl/extern
+  ../nodes
+  ${PYTHON_INC}
+  ${SDL_INC}
+)
+
+IF(WITH_INTERNATIONAL)
+  SET(INC ${INC} ../ftfont)
+  ADD_DEFINITIONS(-DINTERNATIONAL)
+  ADD_DEFINITIONS(-DFTGL_STATIC_LIBRARY)
+ENDIF(WITH_INTERNATIONAL)
+
+IF(WITH_OPENEXR)
+  ADD_DEFINITIONS(-DWITH_OPENEXR)
+ENDIF(WITH_OPENEXR)
+
+IF(WITH_QUICKTIME)
+  SET(INC ${INC} ${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(WIN32)
+  SET(INC ${INC} ${PTHREADS_INC})
+ENDIF(WIN32)
+
+IF(WITH_VERSE)
+  SET(INC ${INC} ${VERSE_INC})
+  ADD_DEFINITIONS(-DWITH_VERSE)
+ENDIF(WITH_VERSE)
+
+# TODO buildinfo
+IF(BF_BUILDINFO)
+  ADD_DEFINITIONS(-DNAN_BUILDINFO)
+ENDIF(BF_BUILDINFO)
+
+BLENDERLIB_NOLIST(bf_editors "${SRC}" "${INC}")
+
+IF(WITH_VERSE)
+  ADD_DEPENDENCIES(bf_editors mkprot verse)
+ENDIF(WITH_VERSE)
+
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt
index 6729d5099f0..c5307bbd4f5 100644
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -33,7 +33,7 @@ SET(INC
   ../python ../render/extern/include ../../../intern/decimation/extern
   ../imbuf ../avi ../../../intern/elbeem/extern
   ../../../intern/iksolver/extern ../blenloader ../quicktime
-  ../blenkernel
+  ../blenkernel ../editors/include
   ${SDL_INC}
   ${ZLIB_INC}
 )
diff --git a/source/blender/radiosity/CMakeLists.txt b/source/blender/radiosity/CMakeLists.txt
index 14805f5bb8d..4e6199233dd 100644
--- a/source/blender/radiosity/CMakeLists.txt
+++ b/source/blender/radiosity/CMakeLists.txt
@@ -32,7 +32,7 @@ FILE(GLOB SRC intern/source/*.c)
 SET(INC 
   extern/include ../blenlib ../blenkernel ../makesdna ../include
   ../../../intern/guardedalloc ../render/extern/include
-  ../render/intern/include
+  ../render/intern/include ../editors/include
 )
 
 BLENDERLIB_NOLIST(blender_radiosity "${SRC}" "${INC}")
diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt
new file mode 100644
index 00000000000..1f89069bc93
--- /dev/null
+++ b/source/blender/windowmanager/CMakeLists.txt
@@ -0,0 +1,86 @@
+# $Id: CMakeLists.txt 12931 2007-12-17 18:20:48Z theeth $
+# ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version. The Blender
+# Foundation also sells licenses for use in proprietary software under
+# the Blender License.  See http://www.blender.org/BL/ for information
+# about this.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, 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/BL DUAL LICENSE BLOCK *****
+
+FILE(GLOB SRC intern/*.c)
+
+SET(INC .
+  ../editors/include
+  ../../../intern/guardedalloc ../../../intern/memutil
+  ../blenlib ../makesdna ../blenkernel
+  ../include ../../../intern/bmfont ../imbuf ../render/extern/include
+  ../../../intern/bsp/extern ../radiosity/extern/include
+  ../../../intern/decimation/extern ../blenloader ../python
+  ../../kernel/gen_system ../../../intern/SoundSystem ../readstreamglue
+  ../quicktime ../../../intern/elbeem/extern
+  ../../../intern/ghost ../../../intern/opennl/extern
+  ../nodes
+  ${PYTHON_INC}
+  ${SDL_INC}
+)
+
+IF(WITH_INTERNATIONAL)
+  SET(INC ${INC} ../ftfont)
+  ADD_DEFINITIONS(-DINTERNATIONAL)
+  ADD_DEFINITIONS(-DFTGL_STATIC_LIBRARY)
+ENDIF(WITH_INTERNATIONAL)
+
+IF(WITH_OPENEXR)
+  ADD_DEFINITIONS(-DWITH_OPENEXR)
+ENDIF(WITH_OPENEXR)
+
+IF(WITH_QUICKTIME)
+  SET(INC ${INC} ${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(WIN32)
+  SET(INC ${INC} ${PTHREADS_INC})
+ENDIF(WIN32)
+
+IF(WITH_VERSE)
+  SET(INC ${INC} ${VERSE_INC})
+  ADD_DEFINITIONS(-DWITH_VERSE)
+ENDIF(WITH_VERSE)
+
+# TODO buildinfo
+IF(BF_BUILDINFO)
+  ADD_DEFINITIONS(-DNAN_BUILDINFO)
+ENDIF(BF_BUILDINFO)
+
+BLENDERLIB_NOLIST(bf_windowmanager "${SRC}" "${INC}")
+
+IF(WITH_VERSE)
+  ADD_DEPENDENCIES(bf_windowmanager mkprot verse)
+ENDIF(WITH_VERSE)
+
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index a34ed069b02..2c8c98c7a02 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -40,6 +40,7 @@ INCLUDE_DIRECTORIES(../../intern/guardedalloc
   ../blender/render/extern/include
   ../blender/python
   ../blender/makesdna
+  ../blender/windowmanager
   ../kernel/gen_messaging
   ../kernel/gen_system
 )
@@ -189,12 +190,13 @@ ADD_DEPENDENCIES(blender makesdna)
 
 FILE(READ ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt BLENDER_LINK_LIBS)
 
-SET(BLENDER_LINK_LIBS bf_nodes ${BLENDER_LINK_LIBS} src blender_python blender_render blender_radiosity blender_IK bf_elbeem)
+SET(BLENDER_LINK_LIBS bf_nodes ${BLENDER_LINK_LIBS} bf_windowmanager bf_editors blender_render blender_radiosity blender_IK bf_elbeem)
 
 IF(UNIX)
   # Sort libraries
   SET(BLENDER_SORTED_LIBS
-    src 
+    bf_windowmanager
+	bf_editors
     bf_decimation 
     blender_BSP 
     bf_soundsystem 
@@ -226,7 +228,8 @@ IF(UNIX)
     bf_moto 
     bf_bmfont 
     verse 
-    src 
+    bf_windowmanager
+	bf_editors
     bf_ftfont 
     extern_ftgl 
     bf_blroutines 
diff --git a/source/gameengine/BlenderRoutines/CMakeLists.txt b/source/gameengine/BlenderRoutines/CMakeLists.txt
index 764be732343..11a87460f20 100644
--- a/source/gameengine/BlenderRoutines/CMakeLists.txt
+++ b/source/gameengine/BlenderRoutines/CMakeLists.txt
@@ -15,6 +15,8 @@ SET(INC
   ../../../source/gameengine/Ketsji 
   ../../../source/blender/blenlib
   ../../../source/blender/blenkernel 
+  ../../../source/blender/editors/include
+  ../../../source/blender/windowmanager
   ../../../source/blender 
   ../../../source/blender/include
   ../../../source/blender/makesdna 
diff --git a/source/gameengine/Converter/CMakeLists.txt b/source/gameengine/Converter/CMakeLists.txt
index db516b20df2..9503b9dece1 100644
--- a/source/gameengine/Converter/CMakeLists.txt
+++ b/source/gameengine/Converter/CMakeLists.txt
@@ -49,6 +49,7 @@ SET(INC
   ../../../source/gameengine/Ketsji/KXNetwork
   ../../../source/blender/blenlib
   ../../../source/blender/blenkernel
+  ../../../source/blender/windowmanager
   ../../../source/blender
   ../../../source/blender/include
   ../../../source/blender/makesdna