From 63eb324bcb5f50b482e16edeadcf7d44bce0e123 Mon Sep 17 00:00:00 2001 From: Antony Riakiotakis Date: Thu, 17 May 2012 08:42:22 +0000 Subject: [PATCH] Fix own mistake: Open Collada libs are different for MinGW/MinGW64 --- CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 61603d7e7e2..552cf77e8a6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1090,7 +1090,11 @@ elseif(WIN32) ${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()