scons file for OIIO (needed for psd)

based on patch by Shinsuke Irie

note: scons is not working for me at the moment so I did not test this
patch. It should work fine though.

5 files changed, 13 insertions, 1 deletions

diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py
index 454e72a1a72..8f0d3ff590b 100644
--- a/build_files/scons/tools/btools.py
+++ b/build_files/scons/tools/btools.py
@@ -576,7 +576,7 @@ def read_opts(env, cfg, args):
         ('BF_CYCLES_CUDA_BINARIES_ARCH', 'CUDA architectures to compile binaries for', []),
 
         (BoolVariable('WITH_BF_OIIO', 'Build with OpenImageIO', False)),
-        (BoolVariable('WITH_BF_STATICOIIO', 'Staticly link to OpenImageIO', False)),
+        (BoolVariable('WITH_BF_STATICOIIO', 'Statically link to OpenImageIO', False)),
         ('BF_OIIO', 'OIIO root path', ''),
         ('BF_OIIO_INC', 'OIIO include path', ''),
         ('BF_OIIO_LIB', 'OIIO library', ''),
diff --git a/source/blender/SConscript b/source/blender/SConscript
index 66d54961131..de052f24c33 100644
--- a/source/blender/SConscript
+++ b/source/blender/SConscript
@@ -49,6 +49,9 @@ makesrna = SConscript('makesrna/SConscript')
 if env['WITH_BF_PYTHON']:
     SConscript(['python/SConscript'])
 
+if env['WITH_BF_OIIO']:
+    SConscript (['imbuf/intern/oiio/SConscript'])
+
 if env['WITH_BF_DDS']:
     SConscript (['imbuf/intern/dds/SConscript'])
 
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript
index 3c3ac61a3cb..3754c15ffa8 100644
--- a/source/blender/blenkernel/SConscript
+++ b/source/blender/blenkernel/SConscript
@@ -101,6 +101,9 @@ if env['WITH_BF_SDL']:
     incs += ' ' + env['BF_SDL_INC']
     defs.append('WITH_SDL')
 
+if env['WITH_BF_OIIO']:
+    defs.append('WITH_OIIO')
+
 if env['WITH_BF_OPENEXR']:
     defs.append('WITH_OPENEXR')
 
diff --git a/source/blender/imbuf/SConscript b/source/blender/imbuf/SConscript
index 03064df293d..5cd96a1c0a0 100644
--- a/source/blender/imbuf/SConscript
+++ b/source/blender/imbuf/SConscript
@@ -55,6 +55,9 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', '
     incs += ' ' + env['BF_PTHREADS_INC']
     incs += ' ../../../intern/utfconv'
 
+if env['WITH_BF_OIIO']:
+    defs.append('WITH_OIIO')
+
 if env['WITH_BF_OPENEXR']:
     defs.append('WITH_OPENEXR')
 else:
diff --git a/source/blender/makesrna/SConscript b/source/blender/makesrna/SConscript
index dfe1ebb3385..9026b166311 100644
--- a/source/blender/makesrna/SConscript
+++ b/source/blender/makesrna/SConscript
@@ -66,6 +66,9 @@ if env['WITH_BF_BULLET']:
     defs.append('WITH_BULLET')
     incs += ' #/intern/rigidbody'
 
+if env['WITH_BF_OIIO']:
+    defs.append('WITH_OIIO')
+
 if env['WITH_BF_OPENEXR']:
     defs.append('WITH_OPENEXR')