kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Collada and llvm both use the same functions and they clash.

Browse Source 
Since we have older llvm for msvc2008 and new one for msvc2013 we need to work around it.
This commit is contained in:
Martijn Berger 2014-08-02 15:20:03 +02:00
parent d5b471eec1
commit 249fbbf764
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build_files/scons/config/win32-vc-config.py
View File

@ -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