[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46713] trunk/blender/CMakeLists.txt: Fix own mistake: Open Collada libs are different for MinGW/MinGW64

Antony Riakiotakis kalast at gmail.com
Thu May 17 10:42:22 CEST 2012


Revision: 46713
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46713
Author:   psy-fi
Date:     2012-05-17 08:42:22 +0000 (Thu, 17 May 2012)
Log Message:
-----------
Fix own mistake: Open Collada libs are different for MinGW/MinGW64

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

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2012-05-17 08:10:19 UTC (rev 46712)
+++ trunk/blender/CMakeLists.txt	2012-05-17 08:42:22 UTC (rev 46713)
@@ -1090,7 +1090,11 @@
 				${LIBDIR}/opencollada/include/GeneratedSaxParser/include
 			)
 			set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib ${OPENCOLLADA}/lib)
-			set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre buffer ftoa xml)
+			if(WITH_MINGW64)
+				set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre buffer ftoa xml)
+			else()
+				set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver expat pcre buffer ftoa)
+			endif()
 			set(PCRE_LIBRARIES pcre)
 		endif()
 




More information about the Bf-blender-cvs mailing list