[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52246] trunk/blender: Windows OIIO:

[Thomas Dinges]

Revision: 52246
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52246
Author:   dingto
Date:     2012-11-15 19:37:29 +0000 (Thu, 15 Nov 2012)
Log Message:
-----------
Windows OIIO:
* bin/OpenImageIO.dll not needed anymore, now statically linked. 

Modified Paths:
--------------
    trunk/blender/SConstruct
    trunk/blender/source/creator/CMakeLists.txt

Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct	2012-11-15 19:33:46 UTC (rev 52245)
+++ trunk/blender/SConstruct	2012-11-15 19:37:29 UTC (rev 52246)
@@ -886,11 +886,6 @@
         dllsources.append('${LCGDIR}/thumbhandler/lib/BlendThumb.dll')
     dllsources.append('${LCGDIR}/thumbhandler/lib/BlendThumb64.dll')
 
-    if env['WITH_BF_OIIO'] and env['OURPLATFORM'] != 'win32-mingw':
-        dllpath = '${LCGDIR}/openimageio/bin/OpenImageIO.dll'
-        if os.path.exists(env.subst(dllpath)):
-            dllsources.append(dllpath)
-
     if env['WITH_BF_OCIO']:
         if not env['OURPLATFORM'] in ('win32-mingw', 'linuxcross'):
             dllsources.append('${LCGDIR}/opencolorio/bin/OpenColorIO.dll')

Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt	2012-11-15 19:33:46 UTC (rev 52245)
+++ trunk/blender/source/creator/CMakeLists.txt	2012-11-15 19:37:29 UTC (rev 52246)
@@ -618,19 +618,8 @@
 	install( # x86 builds can run on x64 Windows, so this is required at all times
 		FILES ${LIBDIR}/thumbhandler/lib/BlendThumb64.dll
 		DESTINATION ${TARGETDIR}
-	)	
+	)
 
-	if(WITH_OPENIMAGEIO)
-		set(OIIODLL ${LIBDIR}/openimageio/bin/OpenImageIO.dll)
-		if(NOT MINGW AND EXISTS ${OIIODLL})
-			install(
-				FILES
-					${OIIODLL}
-				DESTINATION ${TARGETDIR}
-			)
-		endif()
-	endif()
-
 	if(WITH_OPENCOLORIO)
 		set(OCIOBIN ${LIBDIR}/opencolorio/bin)
 		if(NOT MINGW)