diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2014-03-10 21:09:42 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2014-03-10 21:09:53 +0400 |
| commit | ac0cdec90f5a9581e2e45e29ef4d6aae47e2ac1b (patch) | |
| tree | c58a58d6e1aa03d04632bda6e747f937e52f26fc /extern/bullet2 | |
| parent | 2de9da6ee9a8813704ad402c7bc4ba77b35a9267 (diff) | |
OSX/clang3.4: tentative fix for T38746, strange bullet behaviour
Diffstat (limited to 'extern/bullet2')
| -rw-r--r-- | extern/bullet2/src/SConscript | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extern/bullet2/src/SConscript b/extern/bullet2/src/SConscript index ff2e86affb4..f0c13da9f0f 100644 --- a/extern/bullet2/src/SConscript +++ b/extern/bullet2/src/SConscript @@ -37,7 +37,7 @@ bullet2_src += env.Glob("BulletSoftBody/*.cpp") incs = '. BulletCollision BulletDynamics LinearMath BulletSoftBody' -if sys.platform=='darwin' and env['CC'][:-2].endswith('4.6'): # workaround for an gcc-4.6 compiler bug +if sys.platform=='darwin' and (env['C_COMPILER_ID'] == 'gcc' and env['CCVERSION'] <= '4.6.1' or env['C_COMPILER_ID'] == 'clang' and env['CCVERSION'] >= '3.4'): # workaround for compiler bugs env.BlenderLib ( libname = 'extern_bullet2', sources=bullet2_src, includes=Split(incs), defines=Split(defs), libtype=['extern','player'], priority=[20,137], compileflags=cflags, cc_compilerchange='/usr/bin/gcc', cxx_compilerchange='/usr/bin/g++' ) else: env.BlenderLib ( libname = 'extern_bullet2', sources=bullet2_src, includes=Split(incs), defines=Split(defs), libtype=['extern','player'], priority=[20,137], compileflags=cflags ) |