be50ce61be
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.
30 lines
780 B
Python
30 lines
780 B
Python
#!/usr/bin/python
|
|
Import ('env')
|
|
|
|
SConscript(['audaspace/SConscript',
|
|
'string/SConscript',
|
|
'ghost/SConscript',
|
|
'guardedalloc/SConscript',
|
|
'moto/SConscript',
|
|
'container/SConscript',
|
|
'memutil/SConscript/',
|
|
'decimation/SConscript',
|
|
'iksolver/SConscript',
|
|
'boolop/SConscript',
|
|
'opennl/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 not env['BF_NO_ELBEEM']:
|
|
SConscript(['elbeem/SConscript'])
|
|
|
|
if NEW_CSG=='false':
|
|
SConscript(['bsp/SConscript'])
|
|
else:
|
|
SConscript(['csg/SConscript'])
|