scons file for OIIO (needed for psd)
authorDalai Felinto <dfelinto@gmail.com>
Fri, 11 Oct 2013 16:38:31 +0000 (16:38 +0000)
committerDalai Felinto <dfelinto@gmail.com>
Fri, 11 Oct 2013 16:38:31 +0000 (16:38 +0000)
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.

build_files/scons/tools/btools.py
source/blender/SConscript
source/blender/blenkernel/SConscript
source/blender/imbuf/SConscript
source/blender/makesrna/SConscript

index 454e72a1a72975489992cc263aff29abe1c002af..8f0d3ff590b6179d51783127e3d6f492e3106e5e 100644 (file)
@@ -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', ''),
index 66d54961131a3b9d4ed61c96e917f1a202e88969..de052f24c33cb531984e056e69e0a0a24b8201cf 100644 (file)
@@ -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'])
 
index 3c3ac61a3cb9a06d71df6d136c5e3b2fcedd73d2..3754c15ffa84928a0c3cd44d6c6fa4cab4f20c81 100644 (file)
@@ -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')
 
index 03064df293de94906e85e524dc2ff7a1f953d73e..5cd96a1c0a00cd830ed3ed03a67d77034c41073e 100644 (file)
@@ -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:
index dfe1ebb338556209d18f38404ed1dfbf63c97196..9026b166311e9ada7dcf13b1df5b4f5bc5950240 100644 (file)
@@ -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')