diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2014-02-09 21:03:13 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2014-02-09 21:03:13 +0400 |
| commit | a84bcea070a81b9729ada289bd15e1d86881aa70 (patch) | |
| tree | 7e84b42016c096eac7ca423d1930b4c14c858856 /intern/itasc | |
| parent | 685c7a2272b95b6514f4fd36b2c72fe6ed5f1a48 (diff) | |
OSX/scons: allow for compiling with clang-openmp-3.4
See: http://clang-omp.github.io
+ fix a longstanding bad include in darwin-config
Diffstat (limited to 'intern/itasc')
| -rw-r--r-- | intern/itasc/SConscript | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/intern/itasc/SConscript b/intern/itasc/SConscript index 208fee5f2d3..1b7709bb986 100644 --- a/intern/itasc/SConscript +++ b/intern/itasc/SConscript @@ -35,5 +35,7 @@ incs = '. ../../extern/Eigen3' defs = [] -env.BlenderLib ('bf_intern_itasc', sources, Split(incs), defs, libtype=['intern','player'], priority=[20,100] ) - +if env['OURPLATFORM']=='darwin' and env['C_COMPILER_ID'] == 'clang' and env['CCVERSION'] >= '3.4': # workaround for friend declaration specifies a default argument expression, not allowed anymore + env.BlenderLib ('bf_intern_itasc', sources, Split(incs), defs, libtype=['intern','player'], priority=[20,100], cc_compilerchange='/usr/bin/gcc', cxx_compilerchange='/usr/bin/g++' ) +else: + env.BlenderLib ('bf_intern_itasc', sources, Split(incs), defs, libtype=['intern','player'], priority=[20,100]) |