merge with 2.5 at r20783
[blender-staging.git] / source / blender / SConscript
index cd00776440ae2ea4133a877402ef221401649c42..856d6284f440d1571321490c3f9f4a3a693b6424 100644 (file)
@@ -3,7 +3,7 @@ Import ('env')
 import sys
 
 SConscript(['avi/SConscript',
-                       'bmesh/SConscript',
+            'bmesh/SConscript',
             'blenkernel/SConscript',
             'blenlib/SConscript',
             'blenloader/SConscript',
@@ -18,19 +18,14 @@ SConscript(['avi/SConscript',
             'readblenfile/SConscript',
             'render/SConscript',
             'nodes/SConscript',
-            'windowmanager/SConscript'])
+            'windowmanager/SConscript',
+           'blenfont/SConscript'])
 
 
 
 if env['WITH_BF_PYTHON']:
     SConscript(['python/SConscript'])
 
-if env['WITH_BF_YAFRAY']:
-    SConscript(['yafray/SConscript'])
-
-if env['WITH_BF_INTERNATIONAL']:
-    SConscript (['ftfont/SConscript'])
-
 if env['WITH_BF_DDS']:
     SConscript (['imbuf/intern/dds/SConscript'])