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
path: root/extern
diff options
context:
space:
mode:
authorJens Verwiebe <info@jensverwiebe.de>2013-09-09 19:45:09 +0400
committerJens Verwiebe <info@jensverwiebe.de>2013-09-09 19:45:09 +0400
commit0dfc9b1f00b4f6d08a5de5fece15ed871325f91a (patch)
tree02afa6a31f11b9ff00ee9b5e68ebad8049233d5f /extern
parent59be901a37ec9c1b2158b0bc0458da03cdd43d26 (diff)
OSX/clang5: fix broken compiling
Diffstat (limited to 'extern')
-rw-r--r--extern/libmv/SConscript5
1 files changed, 4 insertions, 1 deletions
diff --git a/extern/libmv/SConscript b/extern/libmv/SConscript
index f422eb08c58..3330b548047 100644
--- a/extern/libmv/SConscript
+++ b/extern/libmv/SConscript
@@ -42,7 +42,10 @@ if env['WITH_BF_LIBMV']:
else:
src = env.Glob("libmv-capi_stub.cc")
-env.BlenderLib ( libname = 'extern_libmv', sources=src, includes=Split(incs), defines=defs, libtype=['extern', 'player'], priority=[20,137] )
+if (env['OURPLATFORM'] == 'darwin' and env['XCODE_CUR_VER'] > 4): # Apple LLVM version 5.0 (clang-500.1.74) (based on LLVM 3.3svn)
+ env.BlenderLib ( libname = 'extern_libmv', sources=src, includes=Split(incs), defines=defs, libtype=['extern', 'player'], priority=[20,137], cc_compileflags=env['CCFLAGS'].append('-ftemplate-depth=1024') )
+else:
+ env.BlenderLib ( libname = 'extern_libmv', sources=src, includes=Split(incs), defines=defs, libtype=['extern', 'player'], priority=[20,137] )
if env['WITH_BF_LIBMV']:
SConscript(['third_party/SConscript'])