merge with 2.5 at r20783

[blender-staging.git] / source / blender / SConscript

diff --git a/source/blender/SConscript b/source/blender/SConscript
index 926dc75e7eaeff5b3c9459f32f88592a493d0ecf..856d6284f440d1571321490c3f9f4a3a693b6424 100644 (file)
--- a/source/blender/SConscript
+++ b/source/blender/SConscript
@@ -1,26 +1,36 @@
 #!/usr/bin/python
-Import ('user_options_dict')
+Import ('env')
+import sys
 
 SConscript(['avi/SConscript',
+            'bmesh/SConscript',
             'blenkernel/SConscript',
             'blenlib/SConscript',
             'blenloader/SConscript',
             'blenpluginapi/SConscript',
+            'gpu/SConscript',
+            'editors/SConscript',
             'imbuf/SConscript',
-            'img/SConscript',
+            'imbuf/intern/cineon/SConscript',
             'makesdna/SConscript',
-            'python/SConscript',
+            'makesrna/SConscript',
             'radiosity/SConscript',
             'readblenfile/SConscript',
             'render/SConscript',
-            'src/SConscript',
-            'yafray/SConscript'])
+            'nodes/SConscript',
+            'windowmanager/SConscript',
+           'blenfont/SConscript'])
 
-if user_options_dict['USE_OPENEXR'] == 1:
-    SConscript (['imbuf/intern/openexr/SConscript'])
 
-if user_options_dict['USE_INTERNATIONAL'] == 1:
-    SConscript (['ftfont/SConscript'])
 
-if user_options_dict['USE_QUICKTIME'] == 1:
+if env['WITH_BF_PYTHON']:
+    SConscript(['python/SConscript'])
+
+if env['WITH_BF_DDS']:
+    SConscript (['imbuf/intern/dds/SConscript'])
+
+if env['WITH_BF_OPENEXR']:
+    SConscript (['imbuf/intern/openexr/SConscript'])
+
+if env['WITH_BF_QUICKTIME']:
     SConscript (['quicktime/SConscript'])