Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Verwiebe <info@jensverwiebe.de>2013-10-12 01:37:25 +0400
committerJens Verwiebe <info@jensverwiebe.de>2013-10-12 01:37:25 +0400
commit356de1053472bcf7c93fa3dd62a5ae02844573bd (patch)
treeec8a4997c1d457dc5501516fa277d3bf0dd5cc84 /source/blender/imbuf/intern/oiio
parentb83f755542ca97c025c42bfb0143e78c7cda670f (diff)
scons: fix WITH_PSD compiling, still i think muddled naming is used here, todo: cleanup
Diffstat (limited to 'source/blender/imbuf/intern/oiio')
-rw-r--r--source/blender/imbuf/intern/oiio/SConscript4
1 files changed, 3 insertions, 1 deletions
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'])