Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup of intern/SConstript: CSG is not in source tree anymore, remove option to use it

Browse Source
This commit is contained in:
Sergey Sharybin
2012-05-07 09:01:55 +00:00
parent 2b53595ad6
commit f618bada2b
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
intern/SConscript
View File

@@ -16,25 +16,16 @@ SConscript(['audaspace/SConscript',
'mikktspace/SConscript', 'mikktspace/SConscript',
'smoke/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']: if env ['WITH_BF_REMESH']:
SConscript(['dualcon/SConscript']) SConscript(['dualcon/SConscript'])
if env['WITH_BF_FLUID']: if env['WITH_BF_FLUID']:
SConscript(['elbeem/SConscript']) SConscript(['elbeem/SConscript'])
if env['WITH_BF_CYCLES']: if env['WITH_BF_CYCLES']:
SConscript(['cycles/SConscript']) SConscript(['cycles/SConscript'])
if NEW_CSG == 'false': SConscript(['bsp/SConscript'])
SConscript(['bsp/SConscript'])
else:
SConscript(['csg/SConscript'])
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-mingw', 'linuxcross', 'win64-vc'): if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-mingw', 'linuxcross', 'win64-vc'):
SConscript(['utfconv/SConscript']) SConscript(['utfconv/SConscript'])