diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2013-10-12 01:37:25 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2013-10-12 01:37:25 +0400 |
| commit | 356de1053472bcf7c93fa3dd62a5ae02844573bd (patch) | |
| tree | ec8a4997c1d457dc5501516fa277d3bf0dd5cc84 /source/blender/imbuf | |
| parent | b83f755542ca97c025c42bfb0143e78c7cda670f (diff) | |
scons: fix WITH_PSD compiling, still i think muddled naming is used here, todo: cleanup
Diffstat (limited to 'source/blender/imbuf')
| -rw-r--r-- | source/blender/imbuf/SConscript | 2 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/oiio/SConscript | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/imbuf/SConscript b/source/blender/imbuf/SConscript index 5cd96a1c0a0..ccee3ebcc85 100644 --- a/source/blender/imbuf/SConscript +++ b/source/blender/imbuf/SConscript @@ -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') diff --git a/source/blender/imbuf/intern/oiio/SConscript b/source/blender/imbuf/intern/oiio/SConscript index 124f8fbdfce..82b47e9c46b 100644 --- a/source/blender/imbuf/intern/oiio/SConscript +++ b/source/blender/imbuf/intern/oiio/SConscript @@ -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']) |