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.
27 lines
698 B
Python
27 lines
698 B
Python
#!/usr/bin/python
|
|
|
|
Import('env')
|
|
|
|
SConscript(['glew/SConscript'])
|
|
|
|
if env['WITH_BF_BULLET']:
|
|
SConscript(['bullet2/src/SConscript'])
|
|
|
|
if env['WITH_BF_FFMPEG'] and env['BF_FFMPEG_LIB'] == '':
|
|
SConscript(['x264/SConscript'])
|
|
SConscript(['libmp3lame/SConscript'])
|
|
SConscript(['xvidcore/SConscript'])
|
|
SConscript(['ffmpeg/SConscript'])
|
|
|
|
if env['WITH_BF_OPENJPEG'] and env['BF_OPENJPEG_LIB'] == '':
|
|
SConscript(['libopenjpeg/SConscript'])
|
|
|
|
if env['WITH_BF_REDCODE'] and env['BF_REDCODE_LIB'] == '':
|
|
SConscript(['libredcode/SConscript'])
|
|
|
|
if env['OURPLATFORM'] == 'linux2':
|
|
SConscript(['binreloc/SConscript']);
|
|
|
|
SConscript(['lzo/SConscript'])
|
|
SConscript(['lzma/SConscript'])
|