diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-05-07 13:01:55 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-05-07 13:01:55 +0400 |
| commit | f618bada2b27ab9b41ebbdc3be8baff4e798a6c0 (patch) | |
| tree | 02cc422197b9dfd2715c1e8937ae87a441947fc4 /intern/SConscript | |
| parent | 2b53595ad64a477a07ebc687d207114155f629bc (diff) | |
Cleanup of intern/SConstript: CSG is not in source tree anymore, remove option to use it
Diffstat (limited to 'intern/SConscript')
| -rw-r--r-- | intern/SConscript | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/intern/SConscript b/intern/SConscript index b6305f7dbab..a1e7f840800 100644 --- a/intern/SConscript +++ b/intern/SConscript @@ -16,25 +16,16 @@ SConscript(['audaspace/SConscript', 'mikktspace/SConscript', 'smoke/SConscript']) -# NEW_CSG was intended for intern/csg, but -# getting it to compile is difficult -# intern/bsp has been used anyway, so -# perhaps get rid of intern/csg? -NEW_CSG = 'false' - if env ['WITH_BF_REMESH']: SConscript(['dualcon/SConscript']) if env['WITH_BF_FLUID']: SConscript(['elbeem/SConscript']) - + if env['WITH_BF_CYCLES']: SConscript(['cycles/SConscript']) -if NEW_CSG == 'false': - SConscript(['bsp/SConscript']) -else: - SConscript(['csg/SConscript']) +SConscript(['bsp/SConscript']) if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-mingw', 'linuxcross', 'win64-vc'): SConscript(['utfconv/SConscript']) |