* tweak linking priorities - should help for GCC users
* some lib renaming
This commit is contained in:
@@ -11,21 +11,21 @@ incs += ' ../quicktime ../editors/include ../../kernel/gen_messaging'
|
||||
defs = []
|
||||
|
||||
if env['WITH_BF_YAFRAY'] == 1:
|
||||
incs += ' ../yafray'
|
||||
incs += ' ../yafray'
|
||||
else:
|
||||
defs.append('DISABLE_YAFRAY')
|
||||
defs.append('DISABLE_YAFRAY')
|
||||
|
||||
if env['WITH_BF_QUICKTIME'] == 1:
|
||||
defs.append('WITH_QUICKTIME')
|
||||
incs += ' ' + env['BF_QUICKTIME_INC']
|
||||
defs.append('WITH_QUICKTIME')
|
||||
incs += ' ' + env['BF_QUICKTIME_INC']
|
||||
|
||||
if env['WITH_BF_FFMPEG'] == 1:
|
||||
defs.append('WITH_FFMPEG')
|
||||
defs.append('WITH_FFMPEG')
|
||||
|
||||
if env['WITH_BF_OPENEXR']:
|
||||
defs.append('WITH_OPENEXR')
|
||||
defs.append('WITH_OPENEXR')
|
||||
|
||||
if env['OURPLATFORM']=='linux2':
|
||||
cflags='-pthread'
|
||||
cflags='-pthread'
|
||||
|
||||
env.BlenderLib ( libname = 'blender_render', sources = sources, includes = Split(incs), defines=defs, libtype='core', priority=45, compileflags=cflags )
|
||||
env.BlenderLib ( libname = 'bf_render', sources = sources, includes = Split(incs), defines=defs, libtype='core', priority=55, compileflags=cflags )
|
||||
|
||||
Reference in New Issue
Block a user