Commit: 558fa43ffd5bb1c4950855bd07450841664e89aa
Author: Jens Verwiebe
Date: Tue Mar 11 13:26:51 2014 +0100
https://developer.blender.org/rB558fa43ffd5bb1c4950855bd07450841664e89aa
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 !!!
===================================================================
M extern/bullet2/src/SConscript
===================================================================
diff --git a/extern/bullet2/src/SConscript b/extern/bullet2/src/SConscript
index f0c13da..5c267cb 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 )
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
