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 /config/win32-vc-config.py
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 'config/win32-vc-config.py')
-rw-r--r--config/win32-vc-config.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py
index b3766247d2d..02bce0cc7f3 100644
--- a/config/win32-vc-config.py
+++ b/config/win32-vc-config.py
@@ -139,14 +139,14 @@ BF_FFTW3_LIBPATH = '${BF_FFTW3}/lib'
WITH_BF_REDCODE = False
BF_REDCODE_INC = '#extern'
-WITH_BF_COLLADA = False
+WITH_BF_COLLADA = True
BF_COLLADA = '#source/blender/collada'
BF_COLLADA_INC = '${BF_COLLADA}'
BF_COLLADA_LIB = 'bf_collada'
BF_OPENCOLLADA = LIBDIR + '/opencollada'
BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include'
-BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver xml2 pcre buffer ftoa'
+BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser MathMLSolver xml2 pcre buffer ftoa'
BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
#Ray trace optimization