Commit: 249fbbf7649fda10f594044eb5e576f3b4ca7960
Author: Martijn Berger
Date: Sat Aug 2 15:20:03 2014 +0200
Branches: master
https://developer.blender.org/rB249fbbf7649fda10f594044eb5e576f3b4ca7960
Collada and llvm both use the same functions and they clash.
Since we have older llvm for msvc2008 and new one for msvc2013 we need to work
around it.
===================================================================
M build_files/scons/config/win32-vc-config.py
===================================================================
diff --git a/build_files/scons/config/win32-vc-config.py
b/build_files/scons/config/win32-vc-config.py
index c036bf3..83899e0 100644
--- a/build_files/scons/config/win32-vc-config.py
+++ b/build_files/scons/config/win32-vc-config.py
@@ -154,9 +154,12 @@ BF_COLLADA_LIB = 'bf_collada'
BF_OPENCOLLADA = LIBDIR + '/opencollada'
BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include/opencollada'
-BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader
OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser MathMLSolver xml
pcre buffer ftoa UTF'
+BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader
OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser MathMLSolver xml
pcre buffer ftoa'
BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib/opencollada'
+if not WITH_BF_LLVM or VC_VERSION == '9.0':
+ BF_OPENCOLLADA_LIB = BF_OPENCOLLADA_LIB + ' UTF'
+
WITH_BF_3DMOUSE = True
WITH_BF_OPENMP = True
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
