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
425 B
Python
15 lines
425 B
Python
#!/usr/bin/python
|
|
Import ('env')
|
|
|
|
sources = env.Glob('*.c')
|
|
|
|
incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf ../../blenfont'
|
|
incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
|
|
|
|
defs = []
|
|
|
|
if env['WITH_BF_GAMEENGINE']:
|
|
defs.append('GAMEBLENDER=1')
|
|
|
|
env.BlenderLib ( 'bf_editors_space_userpref', sources, Split(incs), defs, libtype=['core'], priority=[70] )
|