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>2013-04-02 06:05:03 +0400
committerAntony Riakiotakis <kalast@gmail.com>2013-04-02 06:05:03 +0400
commitd067ba9cbc2663fe3d56e055a8cc9fe80e07a4c6 (patch)
tree5d4a4c97e28b85c0f03087bbac29439f2ed77de2 /CMakeLists.txt
parent07d027b1023de26fa2dba45c281612f0bbb29f0a (diff)
Fix build for MinGW without opencollada (updated libs coming soon), MinGW64 now builds with opencollada
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt14
1 files changed, 7 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3cd320c2f31..cf078fb2c9c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1289,17 +1289,17 @@ elseif(WIN32)
if(WITH_OPENCOLLADA)
set(OPENCOLLADA ${LIBDIR}/opencollada)
set(OPENCOLLADA_INCLUDE_DIRS
- ${OPENCOLLADA}/include/COLLADAStreamWriter
- ${OPENCOLLADA}/include/COLLADABaseUtils
- ${OPENCOLLADA}/include/COLLADAFramework
- ${OPENCOLLADA}/include/COLLADASaxFrameworkLoader
- ${OPENCOLLADA}/include/GeneratedSaxParser
+ ${OPENCOLLADA}/include/opencollada/COLLADAStreamWriter
+ ${OPENCOLLADA}/include/opencollada/COLLADABaseUtils
+ ${OPENCOLLADA}/include/opencollada/COLLADAFramework
+ ${OPENCOLLADA}/include/opencollada/COLLADASaxFrameworkLoader
+ ${OPENCOLLADA}/include/opencollada/GeneratedSaxParser
)
set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib/opencollada)
if(WITH_MINGW64)
- set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre buffer ftoa xml)
+ set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver buffer ftoa xml)
else()
- set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver expat pcre buffer ftoa)
+ set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver expat buffer ftoa)
endif()
set(PCRE_LIBRARIES pcre)
endif()