diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2012-05-13 17:32:48 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2012-05-13 17:32:48 +0400 |
| commit | a55e97058b409dc9d62cbfc1634acd3810a2af0e (patch) | |
| tree | cda7ab79c4d5dd44771f3b17927e8e83874cefa0 | |
| parent | dd9c1b7fbf501ef58c9952150698fb5ce3c45903 (diff) | |
Add support for opencollada for MinGW64 and cmake
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a299470b172..d39dfd9e999 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -370,10 +370,6 @@ if(MINGW) "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 @@ elseif(WIN32) ${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() |