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:
authorMartijn Berger <martijn.berger@gmail.com>2014-08-02 17:30:28 +0400
committerMartijn Berger <martijn.berger@gmail.com>2014-08-02 17:30:28 +0400
commite7b396c954491761999c500675d83f16d3095d70 (patch)
treede3903569adfa4587fc5b59475a02c88a5d5e84b
parent249fbbf7649fda10f594044eb5e576f3b4ca7960 (diff)
fix check for not llvm
-rw-r--r--build_files/scons/config/win32-vc-config.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/build_files/scons/config/win32-vc-config.py b/build_files/scons/config/win32-vc-config.py
index 83899e09ce1..b6d582087f6 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'