part 1 of merge from trunk at r30358; it compiles, but doesn't link quite yet :)

4 files changed, 39 insertions, 7 deletions

diff --git a/source/blender/editors/space_api/CMakeLists.txt b/source/blender/editors/space_api/CMakeLists.txt
new file mode 100644
index 00000000000..f186b4f1c8a
--- /dev/null
+++ b/source/blender/editors/space_api/CMakeLists.txt
@@ -0,0 +1,35 @@
+# $Id: CMakeLists.txt 12931 2007-12-17 18:20:48Z theeth $
+# ***** 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
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# Contributor(s): Jacques Beaurain.
+#
+# ***** END GPL LICENSE BLOCK *****
+
+FILE(GLOB SRC *.c)
+
+SET(INC
+	../../blenkernel
+	../../blenlib
+	../../bmesh
+	../include
+	../../../../intern/guardedalloc
+	../../makesdna
+	../../makesrna
+	../../windowmanager
+)
+
+BLENDERLIB(bf_editor_space_api "${SRC}" "${INC}")
diff --git a/source/blender/editors/space_api/SConscript b/source/blender/editors/space_api/SConscript
index 44090e8fc12..d8be59941eb 100644
--- a/source/blender/editors/space_api/SConscript
+++ b/source/blender/editors/space_api/SConscript
@@ -9,7 +9,4 @@ incs += ' #/intern/guardedalloc #/extern/glew/include'
 
 defs = ''
 
-if not env['WITH_BF_PYTHON']:
-    defs += 'DISABLE_PYTHON'
-
 env.BlenderLib ( 'bf_editors_space_api', sources, Split(incs), Split(defs), libtype=['core'], priority=[30] )
diff --git a/source/blender/editors/space_api/space.c b/source/blender/editors/space_api/space.c
index c61e5d93160..66cb88ebf70 100644
--- a/source/blender/editors/space_api/space.c
+++ b/source/blender/editors/space_api/space.c
@@ -1,5 +1,5 @@
 /**
- * $Id:
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
@@ -37,7 +37,6 @@
 #include "BKE_context.h"
 #include "BKE_screen.h"
 
-#include "ED_screen.h"
 
 /* */
 
diff --git a/source/blender/editors/space_api/spacetypes.c b/source/blender/editors/space_api/spacetypes.c
index d8d3d803634..b0f6d456dcc 100644
--- a/source/blender/editors/space_api/spacetypes.c
+++ b/source/blender/editors/space_api/spacetypes.c
@@ -1,5 +1,5 @@
 /**
- * $Id: spacetypes.c
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
@@ -28,7 +28,6 @@
 #include "BLI_blenlib.h"
 
 #include "DNA_object_types.h"
-#include "DNA_scene_types.h"
 #include "DNA_windowmanager_types.h"
 
 #include "BKE_context.h"
@@ -59,6 +58,7 @@
 #include "ED_sound.h"
 #include "ED_uvedit.h"
 #include "ED_mball.h"
+#include "ED_logic.h"
 
 /* only call once on startup, storage is global in BKE kernel listbase */
 void ED_spacetypes_init(void)
@@ -104,6 +104,7 @@ void ED_spacetypes_init(void)
 	ED_operatortypes_metaball();
 	ED_operatortypes_sound();
 	ED_operatortypes_render();
+	ED_operatortypes_logic();
 	
 	UI_view2d_operatortypes();
 	UI_buttons_operatortypes();