tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

scons: fix WITH_PSD compiling, still i think muddled naming is used here, todo: cleanup

This commit is contained in:
Jens Verwiebe 2013-10-11 21:37:25 +00:00
parent b83f755542
commit 356de10534
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/imbuf/SConscript
View File

@ -56,7 +56,7 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', '
incs += ' ../../../intern/utfconv'
if env['WITH_BF_OIIO']:
defs.append('WITH_OIIO')
defs.append('WITH_OPENIMAGEIO')
if env['WITH_BF_OPENEXR']:
defs.append('WITH_OPENEXR')

4
source/blender/imbuf/intern/oiio/SConscript
View File

@ -38,8 +38,10 @@ incs = ['.',
'#/intern/guardedalloc',
'../../../makesdna',
'#/intern/utfconv']
incs += Split(env['BF_OIIO_INC'])
defs = ['WITH_PSD']
defs = ['WITH_OPENIMAGEIO']
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
incs.append(env['BF_PTHREADS_INC'])