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 /source/blender | |
| 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 'source/blender')
| -rw-r--r-- | source/blender/blenlib/intern/threads.c | 2 | ||||
| -rw-r--r-- | source/blender/ikplugin/SConscript | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/blenlib/intern/threads.c b/source/blender/blenlib/intern/threads.c index 5d8c1af6c7f..c9f4e9ddc15 100644 --- a/source/blender/blenlib/intern/threads.c +++ b/source/blender/blenlib/intern/threads.c @@ -54,7 +54,7 @@ # include <sys/time.h> #endif -#if defined(__APPLE__) && defined(_OPENMP) && (__GNUC__ == 4) && (__GNUC_MINOR__ == 2) +#if defined(__APPLE__) && defined(_OPENMP) && (__GNUC__ == 4) && (__GNUC_MINOR__ == 2) && !defined(__clang__) # define USE_APPLE_OMP_FIX #endif diff --git a/source/blender/ikplugin/SConscript b/source/blender/ikplugin/SConscript index 4a4cb4f2cbd..ec19b9a250a 100644 --- a/source/blender/ikplugin/SConscript +++ b/source/blender/ikplugin/SConscript @@ -46,4 +46,7 @@ defs = [ 'WITH_IK_SOLVER', ] -env.BlenderLib('bf_ikplugin', sources, incs, defs, libtype=['core', 'player'], priority=[180, 190]) +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_ikplugin', sources, incs, defs, libtype=['core', 'player'], priority=[180, 190], cc_compilerchange='/usr/bin/gcc', cxx_compilerchange='/usr/bin/g++') +else: + env.BlenderLib('bf_ikplugin', sources, incs, defs, libtype=['core', 'player'], priority=[180, 190]) |