Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntony Riakiotakis <kalast@gmail.com>2012-05-17 12:42:22 +0400
committerAntony Riakiotakis <kalast@gmail.com>2012-05-17 12:42:22 +0400
commit63eb324bcb5f50b482e16edeadcf7d44bce0e123 (patch)
treeb0f8e48dc908f329147ee0fa20858676be601b71
parent599d213115c4df93315e0f481f3fef20f797a4cc (diff)
Fix own mistake: Open Collada libs are different for MinGW/MinGW64
-rw-r--r--CMakeLists.txt6
1 files changed, 5 insertions, 1 deletions
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()