[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60690] trunk/blender/source/blender/imbuf : scons: fix WITH_PSD compiling, still i think muddled naming is used here, todo: cleanup

[jens verwiebe]

Revision: 60690
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60690
Author:   jensverwiebe
Date:     2013-10-11 21:37:25 +0000 (Fri, 11 Oct 2013)
Log Message:
-----------
scons: fix WITH_PSD compiling, still i think muddled naming is used here, todo: cleanup

Modified Paths:
--------------
    trunk/blender/source/blender/imbuf/SConscript
    trunk/blender/source/blender/imbuf/intern/oiio/SConscript

Modified: trunk/blender/source/blender/imbuf/SConscript
===================================================================
--- trunk/blender/source/blender/imbuf/SConscript	2013-10-11 19:44:56 UTC (rev 60689)
+++ trunk/blender/source/blender/imbuf/SConscript	2013-10-11 21:37:25 UTC (rev 60690)
@@ -56,7 +56,7 @@
     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')

Modified: trunk/blender/source/blender/imbuf/intern/oiio/SConscript
===================================================================
--- trunk/blender/source/blender/imbuf/intern/oiio/SConscript	2013-10-11 19:44:56 UTC (rev 60689)
+++ trunk/blender/source/blender/imbuf/intern/oiio/SConscript	2013-10-11 21:37:25 UTC (rev 60690)
@@ -38,8 +38,10 @@
     '#/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'])