[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59961] trunk/blender/extern/libmv/ SConscript: OSX/clang5: revert 59960, todo: make it global

jens verwiebe info at jensverwiebe.de
Mon Sep 9 18:24:23 CEST 2013


Revision: 59961
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59961
Author:   jensverwiebe
Date:     2013-09-09 16:24:23 +0000 (Mon, 09 Sep 2013)
Log Message:
-----------
OSX/clang5: revert 59960, todo: make it global 

Modified Paths:
--------------
    trunk/blender/extern/libmv/SConscript

Modified: trunk/blender/extern/libmv/SConscript
===================================================================
--- trunk/blender/extern/libmv/SConscript	2013-09-09 15:45:09 UTC (rev 59960)
+++ trunk/blender/extern/libmv/SConscript	2013-09-09 16:24:23 UTC (rev 59961)
@@ -42,10 +42,7 @@
 else:
     src = env.Glob("libmv-capi_stub.cc")
 
-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] )
+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'])




More information about the Bf-blender-cvs mailing list