[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55101] trunk/blender/extern/bullet2/src/ SConscript: OSX/gcc-4.6: workaround a compilerbug, use apple-gcc instead

jens verwiebe info at jensverwiebe.de
Thu Mar 7 23:12:24 CET 2013


Revision: 55101
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55101
Author:   jensverwiebe
Date:     2013-03-07 22:12:23 +0000 (Thu, 07 Mar 2013)
Log Message:
-----------
OSX/gcc-4.6: workaround a compilerbug, use apple-gcc instead

Modified Paths:
--------------
    trunk/blender/extern/bullet2/src/SConscript

Modified: trunk/blender/extern/bullet2/src/SConscript
===================================================================
--- trunk/blender/extern/bullet2/src/SConscript	2013-03-07 21:16:03 UTC (rev 55100)
+++ trunk/blender/extern/bullet2/src/SConscript	2013-03-07 22:12:23 UTC (rev 55101)
@@ -35,4 +35,7 @@
 
 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 )




More information about the Bf-blender-cvs mailing list