[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60687] trunk/blender: scons file for OIIO (needed for psd)

[Dalai Felinto]

Revision: 60687
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60687
Author:   dfelinto
Date:     2013-10-11 16:38:31 +0000 (Fri, 11 Oct 2013)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/build_files/scons/tools/btools.py
    trunk/blender/source/blender/SConscript
    trunk/blender/source/blender/blenkernel/SConscript
    trunk/blender/source/blender/imbuf/SConscript
    trunk/blender/source/blender/makesrna/SConscript

Modified: trunk/blender/build_files/scons/tools/btools.py
===================================================================
--- trunk/blender/build_files/scons/tools/btools.py	2013-10-11 16:38:04 UTC (rev 60686)
+++ trunk/blender/build_files/scons/tools/btools.py	2013-10-11 16:38:31 UTC (rev 60687)
@@ -576,7 +576,7 @@
         ('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', ''),

Modified: trunk/blender/source/blender/SConscript
===================================================================
--- trunk/blender/source/blender/SConscript	2013-10-11 16:38:04 UTC (rev 60686)
+++ trunk/blender/source/blender/SConscript	2013-10-11 16:38:31 UTC (rev 60687)
@@ -49,6 +49,9 @@
 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'])
 

Modified: trunk/blender/source/blender/blenkernel/SConscript
===================================================================
--- trunk/blender/source/blender/blenkernel/SConscript	2013-10-11 16:38:04 UTC (rev 60686)
+++ trunk/blender/source/blender/blenkernel/SConscript	2013-10-11 16:38:31 UTC (rev 60687)
@@ -101,6 +101,9 @@
     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')
 

Modified: trunk/blender/source/blender/imbuf/SConscript
===================================================================
--- trunk/blender/source/blender/imbuf/SConscript	2013-10-11 16:38:04 UTC (rev 60686)
+++ trunk/blender/source/blender/imbuf/SConscript	2013-10-11 16:38:31 UTC (rev 60687)
@@ -55,6 +55,9 @@
     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:

Modified: trunk/blender/source/blender/makesrna/SConscript
===================================================================
--- trunk/blender/source/blender/makesrna/SConscript	2013-10-11 16:38:04 UTC (rev 60686)
+++ trunk/blender/source/blender/makesrna/SConscript	2013-10-11 16:38:31 UTC (rev 60687)
@@ -66,6 +66,9 @@
     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')