Merging r38740 through r38764 from trunk into vgroup_modifiers.
[blender.git] / source / blender / SConscript
index 410c2667ff78ae8da60a922b06fe473c0b9dedaf..969bd2966fcb0f1e44410f3729d539f7894bb5d8 100644 (file)
@@ -7,24 +7,34 @@ SConscript(['avi/SConscript',
             'blenlib/SConscript',
             'blenloader/SConscript',
             'blenpluginapi/SConscript',
+            'gpu/SConscript',
+            'editors/SConscript',
             'imbuf/SConscript',
-            'imbuf/intern/cineon/SConscript',
             'makesdna/SConscript',
-            'python/SConscript',
-            'radiosity/SConscript',
-            'readblenfile/SConscript',
+            'makesrna/SConscript',
             'render/SConscript',
-            'src/SConscript',
-            'nodes/SConscript'])
+            'nodes/SConscript',
+            'modifiers/SConscript',
+            'ikplugin/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_OPENEXR'] == 1:
+if env['WITH_BF_PYTHON']:
+    SConscript(['python/SConscript'])
+
+if env['WITH_BF_DDS']:
+    SConscript (['imbuf/intern/dds/SConscript'])
+
+if env['WITH_BF_CINEON']:
+    SConscript (['imbuf/intern/cineon/SConscript'])
+
+if env['WITH_BF_OPENEXR']:
     SConscript (['imbuf/intern/openexr/SConscript'])
 
-if env['WITH_BF_QUICKTIME'] == 1:
+if env['WITH_BF_QUICKTIME']:
     SConscript (['quicktime/SConscript'])
+
+if env['WITH_BF_COLLADA']:
+    SConscript (['collada/SConscript'])