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.
15 lines
389 B
Python
15 lines
389 B
Python
#!/usr/bin/python
|
|
Import ('env')
|
|
|
|
sources = env.Glob('intern/*.c')
|
|
|
|
incs = '. #/intern/guardedalloc ../blenlib ../blenkernel'
|
|
incs += ' ../makesdna ../readblenfile ../editors/include'
|
|
incs += ' ../render/extern/include ../makesrna'
|
|
|
|
incs += ' ' + env['BF_ZLIB_INC']
|
|
|
|
defs = []
|
|
|
|
env.BlenderLib ( 'bf_blenloader', sources, Split(incs), defs, libtype=['core','player'], priority = [167,30] )
|