10 files changed, 58 insertions, 25 deletions
diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py
index 8633a89c091..eae4f490b38 100644
--- a/config/win32-vc-config.py
+++ b/config/win32-vc-config.py
@@ -145,7 +145,7 @@ BF_OPENGL_LIB_STATIC = [ '${BF_OPENGL}/lib/libGL.a', '${BF_OPENGL}/lib/libGLU.a'
 CC = 'cl.exe'
 CXX = 'cl.exe'
 
-CCFLAGS = ['/nologo', '/Og', '/Ot', '/Ob1', '/Op', '/G6','/EHsc', '/J', '/W3', '/Gd', '/MT']
+CCFLAGS = ['/nologo', '/Ot', '/Ob1', '/EHsc', '/J', '/W3', '/Gd', '/MT']
 
 BF_DEBUG_FLAGS = ['/Zi', '/FR${TARGET}.sbr']
 
diff --git a/source/blender/SConscript b/source/blender/SConscript
index 1fd28df62c8..3d3fa6e2f69 100644
--- a/source/blender/SConscript
+++ b/source/blender/SConscript
@@ -3,31 +3,32 @@ Import ('env')
 import sys
 
 SConscript(['avi/SConscript',
-            'blenkernel/SConscript',
-            'blenlib/SConscript',
-            'blenloader/SConscript',
-            'blenpluginapi/SConscript',
-            'editors/SConscript',
-            'imbuf/SConscript',
-            'imbuf/intern/cineon/SConscript',
-            'makesdna/SConscript',
-            'radiosity/SConscript',
-            'readblenfile/SConscript',
-            'render/SConscript',
-            'nodes/SConscript',
-            'windowmanager/SConscript'])
+			'blenkernel/SConscript',
+			'blenlib/SConscript',
+			'blenloader/SConscript',
+			'blenpluginapi/SConscript',
+			'editors/SConscript',
+			'imbuf/SConscript',
+			'imbuf/intern/cineon/SConscript',
+			'makesdna/SConscript',
+			'python/SConscript',
+			'radiosity/SConscript',
+			'readblenfile/SConscript',
+			'render/SConscript',
+			'nodes/SConscript',
+			'windowmanager/SConscript'])
 
 if env['WITH_BF_YAFRAY'] == 1:
-    SConscript(['yafray/SConscript'])
+	SConscript(['yafray/SConscript'])
 
 if env['WITH_BF_INTERNATIONAL'] == 1:
-    SConscript (['ftfont/SConscript'])
+	SConscript (['ftfont/SConscript'])
 
 if env['WITH_BF_DDS'] == 1:
-    SConscript (['imbuf/intern/dds/SConscript'])
+	SConscript (['imbuf/intern/dds/SConscript'])
 
 if env['WITH_BF_OPENEXR'] == 1:
-    SConscript (['imbuf/intern/openexr/SConscript'])
+	SConscript (['imbuf/intern/openexr/SConscript'])
 
 if env['WITH_BF_QUICKTIME'] == 1:
-    SConscript (['quicktime/SConscript'])
+	SConscript (['quicktime/SConscript'])
diff --git a/source/blender/editors/SConscript b/source/blender/editors/SConscript
index ec56e557c79..46c63c4900b 100644
--- a/source/blender/editors/SConscript
+++ b/source/blender/editors/SConscript
@@ -2,6 +2,10 @@
 Import ('env')
 
 
-SConscript(['area/SConscript',
-            'datafiles/SConscript',
-            'screen/SConscript'])
+SConscript(['datafiles/SConscript',
+			'interface/SConscript',
+			'mesh/SConscript',
+			'object/SConscript',
+			'space_view3d/SConscript',
+			'transform/SConscript',
+			'screen/SConscript'])
diff --git a/source/blender/editors/interface/SConscript b/source/blender/editors/interface/SConscript
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/source/blender/editors/interface/SConscript
diff --git a/source/blender/editors/mesh/SConscript b/source/blender/editors/mesh/SConscript
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/source/blender/editors/mesh/SConscript
diff --git a/source/blender/editors/object/SConscript b/source/blender/editors/object/SConscript
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/source/blender/editors/object/SConscript
diff --git a/source/blender/editors/screen/SConscript b/source/blender/editors/screen/SConscript
index ec56e557c79..e02c0d06616 100644
--- a/source/blender/editors/screen/SConscript
+++ b/source/blender/editors/screen/SConscript
@@ -1,7 +1,10 @@
 #!/usr/bin/python
 Import ('env')
 
+sources = env.Glob('*.c')
 
-SConscript(['area/SConscript',
-            'datafiles/SConscript',
-            'screen/SConscript'])
+incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
+incs += ' ../../blenloader ../../windowmanager ../../python'
+incs += ' #/intern/guardedalloc'
+
+env.BlenderLib ( 'bf_screen', sources, Split(incs), [], libtype=['core','intern'], priority=[5, 25] )
diff --git a/source/blender/editors/space_view3d/SConscript b/source/blender/editors/space_view3d/SConscript
new file mode 100644
index 00000000000..3d630adb93f
--- /dev/null
+++ b/source/blender/editors/space_view3d/SConscript
@@ -0,0 +1,9 @@
+#!/usr/bin/python
+Import ('env')
+
+sources = env.Glob('*.c')
+
+incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
+incs += ' #/intern/guardedalloc'
+
+env.BlenderLib ( 'bf_space_view3d', sources, Split(incs), [], libtype=['core','intern'], priority=[5, 25] )
diff --git a/source/blender/editors/transform/SConscript b/source/blender/editors/transform/SConscript
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/source/blender/editors/transform/SConscript
diff --git a/source/blender/python/SConscript b/source/blender/python/SConscript
new file mode 100644
index 00000000000..78bef4fb0ae
--- /dev/null
+++ b/source/blender/python/SConscript
@@ -0,0 +1,16 @@
+#!/usr/bin/python
+Import ('env')
+
+sources = env.Glob('intern/*.c')
+
+incs = '. ../editors/include ../makesdna ../blenlib ../blenkernel ../nodes'
+incs += ' ../imbuf ../blenloader ../render/extern/include'
+incs += ' #intern/guardedalloc #intern/memutil'
+incs += ' ' + env['BF_PYTHON_INC']
+
+defs = []
+
+if env['OURPLATFORM'] in ('win32-mingw', 'win32-vc') and env['BF_DEBUG']:
+	defs.append('Py_TRACE_REFS')
+
+env.BlenderLib( libname = 'bf_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core'], priority = [60])