diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2009-09-19 02:25:49 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2009-09-19 02:25:49 +0400 |
| commit | be50ce61be7fdc96943dbdac79aabd88ba29996f (patch) | |
| tree | 4dfde72478458923a3b2ce8d22e1658d4508024c /source/blender/SConscript | |
| parent | 0a4d70f4d0ddc5bc709b162d84ec334e66ed848d (diff) | |
Merged
https://svn.blender.org/svnroot/bf-blender/branches/soc-2008-mxcurioni (r22789) and
https://svn.blender.org/svnroot/bf-blender/trunk/blender (r23338)
with the "Ignore ancestry" and "Ignore line endings" options enabled (using
TortoiseSVN on Windows).
After the merge operation, all changes (i.e., deletion) in source/blender/freestyle/
were reverted in order to keep the primary source tree of the Freestyle renderer.
Diffstat (limited to 'source/blender/SConscript')
| -rw-r--r-- | source/blender/SConscript | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/source/blender/SConscript b/source/blender/SConscript index 6e16a01e25f..a064850c170 100644 --- a/source/blender/SConscript +++ b/source/blender/SConscript @@ -8,26 +8,22 @@ SConscript(['avi/SConscript', 'blenloader/SConscript', 'blenpluginapi/SConscript', 'gpu/SConscript', + 'editors/SConscript', 'imbuf/SConscript', 'imbuf/intern/cineon/SConscript', 'makesdna/SConscript', - 'radiosity/SConscript', + 'makesrna/SConscript', 'readblenfile/SConscript', 'render/SConscript', - 'src/SConscript', - 'nodes/SConscript']) + 'nodes/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']) @@ -36,6 +32,3 @@ if env['WITH_BF_OPENEXR']: if env['WITH_BF_QUICKTIME']: SConscript (['quicktime/SConscript']) - -if env['WITH_BF_FREESTYLE'] == 1: - SConscript(['freestyle/SConscript']) |