diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2014-03-11 16:26:51 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2014-03-11 16:27:06 +0400 |
| commit | 558fa43ffd5bb1c4950855bd07450841664e89aa (patch) | |
| tree | e159806228e421db33724687ae5f6cc760db41b0 /extern/bullet2 | |
| parent | 500088d9e34439a936d8060e4b0026508d046879 (diff) | |
OSX/bullet: Truely fix T38746 now, compile flags where not propagated right,
also remove gcc 4.6 workaround, i don’t think its needed any longer.
!!! pls check if this would be right thing todo for othere OS too !!!
Diffstat (limited to 'extern/bullet2')
| -rw-r--r-- | extern/bullet2/src/SConscript | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extern/bullet2/src/SConscript b/extern/bullet2/src/SConscript index f0c13da9f0f..5c267cbd477 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['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++' ) +if sys.platform=='darwin': + env.BlenderLib ( libname = 'extern_bullet2', sources=bullet2_src, includes=Split(incs), defines=Split(defs), libtype=['extern','player'], priority=[20,137], cxx_compileflags=cflags ) else: env.BlenderLib ( libname = 'extern_bullet2', sources=bullet2_src, includes=Split(incs), defines=Split(defs), libtype=['extern','player'], priority=[20,137], compileflags=cflags ) |