merge with 2.5 at r20783
[blender-staging.git] / source / blender / SConscript
index decbbf3564224805e277cc86c1c31609e12b973f..856d6284f440d1571321490c3f9f4a3a693b6424 100644 (file)
@@ -3,26 +3,28 @@ Import ('env')
 import sys
 
 SConscript(['avi/SConscript',
+            'bmesh/SConscript',
             'blenkernel/SConscript',
             'blenlib/SConscript',
             'blenloader/SConscript',
             'blenpluginapi/SConscript',
             'gpu/SConscript',
+            'editors/SConscript',
             'imbuf/SConscript',
             'imbuf/intern/cineon/SConscript',
             'makesdna/SConscript',
-            'python/SConscript',
+            'makesrna/SConscript',
             'radiosity/SConscript',
             'readblenfile/SConscript',
             'render/SConscript',
-            'src/SConscript',
-            'nodes/SConscript'])
+            'nodes/SConscript',
+            'windowmanager/SConscript',
+           'blenfont/SConscript'])
 
-if env['WITH_BF_YAFRAY']:
-    SConscript(['yafray/SConscript'])
 
-if env['WITH_BF_INTERNATIONAL']:
-    SConscript (['ftfont/SConscript'])
+
+if env['WITH_BF_PYTHON']:
+    SConscript(['python/SConscript'])
 
 if env['WITH_BF_DDS']:
     SConscript (['imbuf/intern/dds/SConscript'])