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:
authorNathan Letwory <nathan@letworyinteractive.com>2010-06-06 04:33:59 +0400
committerNathan Letwory <nathan@letworyinteractive.com>2010-06-06 04:33:59 +0400
commita6d5f43ac850e62100dedbdcee0823699bab34e6 (patch)
tree6dc089ff62667a293ff0dedea40c2b4277463f41 /CMakeLists.txt
parent2ebb1c63f7b26478ed4c85d572312adf562b3148 (diff)
* update CMake and SCons for the OpenCollada update (to r746).
- DocumentExporter changed due to function name change in API - no more UTF lib - enabled by default for win32 Note: debug libs will be added later, as well as 64bit windows libs. For other platforms, get r746 of OpenCollada and build against that.
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 287b3394456..7202ff9024c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -422,7 +422,7 @@ IF(WIN32)
SET(OPENCOLLADA ${LIBDIR}/opencollada)
SET(OPENCOLLADA_INC ${OPENCOLLADA}/include)
SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
- SET(OPENCOLLADA_LIB OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver GeneratedSaxParser UTF xml2 buffer ftoa)
+ SET(OPENCOLLADA_LIB OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver GeneratedSaxParser xml2 buffer ftoa)
#pcre is bundled with openCollada
#SET(PCRE ${LIBDIR}/pcre)
#SET(PCRE_LIBPATH ${PCRE}/lib)