diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2013-03-08 02:12:23 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2013-03-08 02:12:23 +0400 |
| commit | 373de9e9361cdf624cdecf33e7effd4a241f3cc8 (patch) | |
| tree | 2ddc43f59432997bae26358f9408825e13cf9a38 /extern | |
| parent | 8db7a34167f6a5573c547b13fb25c735fd1cdcb6 (diff) | |
OSX/gcc-4.6: workaround a compilerbug, use apple-gcc instead
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/bullet2/src/SConscript | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/extern/bullet2/src/SConscript b/extern/bullet2/src/SConscript index 8a3db17f6d1..3ffff9c80fc 100644 --- a/extern/bullet2/src/SConscript +++ b/extern/bullet2/src/SConscript @@ -35,4 +35,7 @@ bullet2_src += env.Glob("BulletSoftBody/*.cpp") incs = '. BulletCollision BulletDynamics LinearMath BulletSoftBody' -env.BlenderLib ( libname = 'extern_bullet2', sources=bullet2_src, includes=Split(incs), defines=Split(defs), libtype=['extern','player'], priority=[20,137], compileflags=cflags ) +if sys.platform=='darwin' and env['CC'][:-2].endswith('4.6'): # workaround for an gcc-4.6 compiler bug + 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 ) |