merge with 2.5 at r20783
[blender-staging.git] / source / blender / SConscript
index 2c39a6d6ff85cd9a12720115d66b323e37e4bc38..856d6284f440d1571321490c3f9f4a3a693b6424 100644 (file)
@@ -3,33 +3,34 @@ 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',
-                       'makesrna/SConscript',
-                       'python/SConscript',
-                       'radiosity/SConscript',
-                       'readblenfile/SConscript',
-                       'render/SConscript',
-                       'nodes/SConscript',
-                       'windowmanager/SConscript'])
+            'bmesh/SConscript',
+            'blenkernel/SConscript',
+            'blenlib/SConscript',
+            'blenloader/SConscript',
+            'blenpluginapi/SConscript',
+            'gpu/SConscript',
+            'editors/SConscript',
+            'imbuf/SConscript',
+            'imbuf/intern/cineon/SConscript',
+            'makesdna/SConscript',
+            'makesrna/SConscript',
+            'radiosity/SConscript',
+            'readblenfile/SConscript',
+            'render/SConscript',
+            'nodes/SConscript',
+            'windowmanager/SConscript',
+           'blenfont/SConscript'])
 
-if env['WITH_BF_YAFRAY'] == 1:
-       SConscript(['yafray/SConscript'])
 
-if env['WITH_BF_INTERNATIONAL'] == 1:
-       SConscript (['ftfont/SConscript'])
 
-if env['WITH_BF_DDS'] == 1:
-       SConscript (['imbuf/intern/dds/SConscript'])
+if env['WITH_BF_PYTHON']:
+    SConscript(['python/SConscript'])
 
-if env['WITH_BF_OPENEXR'] == 1:
-       SConscript (['imbuf/intern/openexr/SConscript'])
+if env['WITH_BF_DDS']:
+    SConscript (['imbuf/intern/dds/SConscript'])
 
-if env['WITH_BF_QUICKTIME'] == 1:
-       SConscript (['quicktime/SConscript'])
+if env['WITH_BF_OPENEXR']:
+    SConscript (['imbuf/intern/openexr/SConscript'])
+
+if env['WITH_BF_QUICKTIME']:
+    SConscript (['quicktime/SConscript'])