[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45914] trunk/blender: Add cycles support for MinGW-w64

Antony Riakiotakis kalast at gmail.com
Tue Apr 24 11:58:03 CEST 2012


Revision: 45914
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45914
Author:   psy-fi
Date:     2012-04-24 09:58:03 +0000 (Tue, 24 Apr 2012)
Log Message:
-----------
Add cycles support for MinGW-w64

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

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2012-04-24 09:56:49 UTC (rev 45913)
+++ trunk/blender/CMakeLists.txt	2012-04-24 09:58:03 UTC (rev 45914)
@@ -373,8 +373,8 @@
 		                    "line if youre a developer who wants to add support.")
 	endif()
 	
-	if((WITH_MINGW64) AND (WITH_CYCLES OR WITH_OPENCOLLADA OR WITH_LIBMV OR WITH_CODEC_FFMPEG))
-		message(FATAL_ERROR "MINGW64 still doesn't support: WITH_CYCLES/WITH_IMAGE_OPENEXR/WITH_OPENCOLLADA/WITH_LIBMV/WITH_CODEC_FFMPEG")
+	if((WITH_MINGW64) AND (WITH_OPENCOLLADA OR WITH_LIBMV OR WITH_CODEC_FFMPEG))
+		message(FATAL_ERROR "MINGW64 still doesn't support: WITH_OPENCOLLADA/WITH_LIBMV/WITH_CODEC_FFMPEG")
 	endif()
 endif()
 

Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt	2012-04-24 09:56:49 UTC (rev 45913)
+++ trunk/blender/source/creator/CMakeLists.txt	2012-04-24 09:58:03 UTC (rev 45914)
@@ -599,12 +599,14 @@
 	)	
 
 	if(WITH_OPENIMAGEIO)
-		set_lib_path(OIIOBIN "openimageio/bin")
-		install(
-			FILES
-				${OIIOBIN}/OpenImageIO.dll
-			DESTINATION ${TARGETDIR}
-		)
+		if(NOT MINGW)
+			set_lib_path(OIIOBIN "openimageio/bin")
+			install(
+				FILES
+					${OIIOBIN}/OpenImageIO.dll
+				DESTINATION ${TARGETDIR}
+			)
+		endif()
 	endif()
 
 elseif(APPLE)




More information about the Bf-blender-cvs mailing list