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.
29 lines
651 B
Python
29 lines
651 B
Python
#!/usr/bin/python
|
|
|
|
import sys
|
|
|
|
Import('env')
|
|
|
|
sources = env.Glob('*.c')
|
|
|
|
incs = '.'
|
|
flags = []
|
|
defs = []
|
|
|
|
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
|
|
flags = []
|
|
defs.append('OPJ_STATIC')
|
|
else:
|
|
flags = ['-Wall', '-O3', '-ffast-math', '-std=c99']
|
|
|
|
oj_env = env.Clone()
|
|
if not env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
|
|
oj_env.Replace(CCFLAGS = '')
|
|
oj_env.Replace(BF_DEBUG_FLAGS = '')
|
|
|
|
oj_env.BlenderLib ( libname='extern_openjpeg',
|
|
sources=sources, includes=Split(incs),
|
|
defines=defs,
|
|
libtype=['extern','player'],
|
|
priority=[10,185], compileflags = flags)
|