diff options
| author | Martijn Berger <martijn.berger@gmail.com> | 2014-08-02 17:20:03 +0400 |
|---|---|---|
| committer | Martijn Berger <martijn.berger@gmail.com> | 2014-08-02 17:20:03 +0400 |
| commit | 249fbbf7649fda10f594044eb5e576f3b4ca7960 (patch) | |
| tree | ea977729015c9ce6f2d510feaad9893451d33fc1 /build_files | |
| parent | d5b471eec1f7d82c510c817bfbc64e2a0fe0697b (diff) | |
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.
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/scons/config/win32-vc-config.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/build_files/scons/config/win32-vc-config.py b/build_files/scons/config/win32-vc-config.py index c036bf317cb..83899e09ce1 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 |