[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46605] trunk/blender/CMakeLists.txt: Add support for opencollada for MinGW64 and cmake

Antony Riakiotakis kalast at gmail.com
Sun May 13 15:32:49 CEST 2012


Revision: 46605
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46605
Author:   psy-fi
Date:     2012-05-13 13:32:48 +0000 (Sun, 13 May 2012)
Log Message:
-----------
Add support for opencollada for MinGW64 and cmake

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

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2012-05-13 12:32:44 UTC (rev 46604)
+++ trunk/blender/CMakeLists.txt	2012-05-13 13:32:48 UTC (rev 46605)
@@ -370,10 +370,6 @@
 		                    "because it is currently unsupported, remove this "
 		                    "line if youre a developer who wants to add support.")
 	endif()
-	
-	if((WITH_MINGW64) AND (WITH_OPENCOLLADA))
-		message(FATAL_ERROR "MINGW64 still doesn't support: WITH_OPENCOLLADA/WITH_CODEC_FFMPEG")
-	endif()
 endif()
 
 TEST_SSE_SUPPORT(COMPILER_SSE_FLAG COMPILER_SSE2_FLAG)
@@ -1081,7 +1077,7 @@
 				${LIBDIR}/opencollada/include/GeneratedSaxParser/include
 			)
 			set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib ${OPENCOLLADA}/lib)
-			set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver expat pcre buffer ftoa)
+			set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre buffer ftoa xml)
 			set(PCRE_LIBRARIES pcre)
 		endif()
 




More information about the Bf-blender-cvs mailing list