[Bf-blender-cvs] [4e3f270] master: OSX/bullet: do a last fix for scons. Now in both buildsystems the used flags are in sync for OSX

[Jens Verwiebe]

Commit: 4e3f27032e86a9e04af87a4c6881f2f54de01f1a
Author: Jens Verwiebe
Date:   Tue Mar 11 17:34:20 2014 +0100
https://developer.blender.org/rB4e3f27032e86a9e04af87a4c6881f2f54de01f1a

OSX/bullet: do a last fix for scons. Now in both buildsystems the used flags are in sync for OSX

===================================================================

M	extern/bullet2/CMakeLists.txt
M	extern/bullet2/src/SConscript

===================================================================

diff --git a/extern/bullet2/CMakeLists.txt b/extern/bullet2/CMakeLists.txt
index 7129223..e816952 100644
--- a/extern/bullet2/CMakeLists.txt
+++ b/extern/bullet2/CMakeLists.txt
@@ -406,7 +406,7 @@ endif()
 # Tentative fix for bullet misbehavior (T38746), needs further clarification what flags conflict here
 if(APPLE AND CMAKE_C_COMPILER_ID MATCHES "Clang" AND NOT ${CMAKE_C_COMPILER_VERSION} VERSION_LESS '3.4')
 	set(CMAKE_C_FLAGS_RELEASE "") # c-api uses plain basic flags
-	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -fPIC -msse3 -mssse3")
+	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -fPIC -msse3 -mssse3 -ffast-math")
 endif()
 
 blender_add_lib(extern_bullet "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/extern/bullet2/src/SConscript b/extern/bullet2/src/SConscript
index 5c267cb..c1e8592 100644
--- a/extern/bullet2/src/SConscript
+++ b/extern/bullet2/src/SConscript
@@ -19,7 +19,7 @@ elif env['OURPLATFORM'] in ('linux', 'freebsd4', 'freebsd5'):
     cflags += ['-O2']
 elif sys.platform=='darwin':
     defs += ' NDEBUG'
-    cflags += ['-O2','-pipe', '-fPIC', '-funsigned-char', '-ffast-math']
+    bt_cxx_flags = env['CXXFLAGS'] + ['-fPIC', '-msse3', '-mssse3', '-ffast-math']
 
 bullet2_src = env.Glob("LinearMath/*.cpp")
 bullet2_src += env.Glob("BulletCollision/BroadphaseCollision/*.cpp")
@@ -38,6 +38,6 @@ bullet2_src += env.Glob("BulletSoftBody/*.cpp")
 incs = '. BulletCollision BulletDynamics LinearMath BulletSoftBody'
 
 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 )
+	env.BlenderLib ( libname = 'extern_bullet2', sources=bullet2_src, includes=Split(incs), defines=Split(defs), libtype=['extern','player'], priority=[20,137], cc_compileflags=env['CCFLAGS'], cxx_compileflags=bt_cxx_flags )
 else:
 	env.BlenderLib ( libname = 'extern_bullet2', sources=bullet2_src, includes=Split(incs), defines=Split(defs), libtype=['extern','player'], priority=[20,137], compileflags=cflags )