[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45975] trunk/blender/SConstruct: Fix OIIO dll copying for win32-mingw

Nathan Letwory nathan at letworyinteractive.com
Thu Apr 26 10:04:12 CEST 2012


Revision: 45975
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45975
Author:   jesterking
Date:     2012-04-26 08:04:11 +0000 (Thu, 26 Apr 2012)
Log Message:
-----------
Fix OIIO dll copying for win32-mingw

Modified Paths:
--------------
    trunk/blender/SConstruct

Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct	2012-04-26 05:17:54 UTC (rev 45974)
+++ trunk/blender/SConstruct	2012-04-26 08:04:11 UTC (rev 45975)
@@ -774,7 +774,7 @@
         dllsources.append('${LCGDIR}/thumbhandler/lib/BlendThumb.dll')	
     dllsources.append('${LCGDIR}/thumbhandler/lib/BlendThumb64.dll')
 
-    if env['WITH_BF_OIIO']:
+    if env['WITH_BF_OIIO'] and env['OURPLATFORM'] != 'win32-mingw':
         dllsources.append('${LCGDIR}/openimageio/bin/OpenImageIO.dll')
 
     dllsources.append('#source/icons/blender.exe.manifest')




More information about the Bf-blender-cvs mailing list