From 558fa43ffd5bb1c4950855bd07450841664e89aa Mon Sep 17 00:00:00 2001 From: Jens Verwiebe Date: Tue, 11 Mar 2014 13:26:51 +0100 Subject: =?UTF-8?q?OSX/bullet:=20Truely=20fix=20T38746=20now,=20compile=20?= =?UTF-8?q?flags=20where=20not=20propagated=20right,=20also=20remove=20gcc?= =?UTF-8?q?=204.6=20workaround,=20i=20don=E2=80=99t=20think=20its=20needed?= =?UTF-8?q?=20any=20longer.=20!!!=20pls=20check=20if=20this=20would=20be?= =?UTF-8?q?=20right=20thing=20todo=20for=20othere=20OS=20too=20!!!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extern/bullet2/src/SConscript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'extern/bullet2') 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 ) -- cgit v1.2.3