[Bf-blender-cvs] [6ffabfa] master: Fix T39646: Rigid Body Constraints non functional on release builds

[Sergej Reich]

Commit: 6ffabfae852f956f5074ddb75e94a4f6fb846d1d
Author: Sergej Reich
Date:   Wed Apr 9 01:22:54 2014 +0200
https://developer.blender.org/rB6ffabfae852f956f5074ddb75e94a4f6fb846d1d

Fix T39646: Rigid Body Constraints non functional on release builds

-ffast-math is evil, not sure why it was enabled...
I seems to work better on OSX but it's still not a good idea.

The SConscript for bullet is a mess, I don't understand why
we use different flags for different platforms in the first place.
Seems to be a historical artifact but I don't know enough about scons
to try and clean it up.

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

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

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

diff --git a/extern/bullet2/CMakeLists.txt b/extern/bullet2/CMakeLists.txt
index a05f20e..9cb6dcd 100644
--- a/extern/bullet2/CMakeLists.txt
+++ b/extern/bullet2/CMakeLists.txt
@@ -404,10 +404,6 @@ if(CMAKE_COMPILER_IS_GNUCXX)
 
 endif()
 
-if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_C_COMPILER_ID MATCHES "Clang")
-	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -ffast-math")
-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_SOURCE_FILES_PROPERTIES(src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp COMPILE_FLAGS "-O0")
diff --git a/extern/bullet2/src/SConscript b/extern/bullet2/src/SConscript
index 58c97f0..6e51d06 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'
-    bt_flags = env['CCFLAGS'] + ['-fPIC', '-msse','-msse2', '-msse3', '-mssse3', '-ffast-math'] # basic -O0 optimization
+    bt_flags = env['CCFLAGS'] + ['-fPIC', '-msse','-msse2', '-msse3', '-mssse3'] # basic -O0 optimization
     bt_opt_flags = bt_flags + ['-O3']
 
 bullet2_src = env.Glob("LinearMath/*.cpp")