Merged changes in the trunk up to revision 39759.
[blender.git] / source / blender / SConscript
index 98e8ad73199a41ae670c432660621423386b3adb..ed69c9e57e9b238ce6ba2708f50364411c11d8ce 100644 (file)
@@ -9,11 +9,10 @@ SConscript(['avi/SConscript',
             'blenpluginapi/SConscript',
             'gpu/SConscript',
             'editors/SConscript',
+                       'freestyle/SConscript',
             'imbuf/SConscript',
-            'imbuf/intern/cineon/SConscript',
             'makesdna/SConscript',
             'makesrna/SConscript',
-            'readblenfile/SConscript',
             'render/SConscript',
             'nodes/SConscript',
             'modifiers/SConscript',
@@ -29,6 +28,9 @@ if env['WITH_BF_PYTHON']:
 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'])