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 !!!
This commit is contained in:
parent
500088d9e3
commit
558fa43ffd
Notes:
blender-bot
2023-02-14 11:09:42 +01:00
Referenced by issue #38746, Rigid body simulation behaves wildly on OSX
|
@ -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 )
|
||||
|
|
Loading…
Reference in New Issue