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()
 

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to