Commit: e7b396c954491761999c500675d83f16d3095d70
Author: Martijn Berger
Date: Sat Aug 2 15:30:28 2014 +0200
Branches: master
https://developer.blender.org/rBe7b396c954491761999c500675d83f16d3095d70
fix check for not llvm
===================================================================
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 83899e0..b6d5820 100644
--- a/build_files/scons/config/win32-vc-config.py
+++ b/build_files/scons/config/win32-vc-config.py
@@ -157,9 +157,6 @@ BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include/opencollada'
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
@@ -266,3 +263,4 @@ if VC_VERSION == '12.0':
else:
BF_BUILDDIR = '..\\build\\win32-vc9'
BF_INSTALLDIR='..\\install\\win32-vc9'
+ BF_OPENCOLLADA_LIB = BF_OPENCOLLADA_LIB + ' UTF'
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
