[Bf-blender-cvs] [5ff0500] master: OSX/cmake/bullet: fix ambigoius compiler ID and make deoptimize fix a bit stricter to reduce speed penalty

Jens Verwiebe noreply at git.blender.org
Tue Mar 18 12:18:35 CET 2014


Commit: 5ff0500593021f42ef9e9945f6168321b340ba9b
Author: Jens Verwiebe
Date:   Tue Mar 18 12:16:53 2014 +0100
https://developer.blender.org/rB5ff0500593021f42ef9e9945f6168321b340ba9b

OSX/cmake/bullet: fix ambigoius compiler ID and make deoptimize fix a bit stricter to reduce speed penalty

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

M	extern/bullet2/CMakeLists.txt

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

diff --git a/extern/bullet2/CMakeLists.txt b/extern/bullet2/CMakeLists.txt
index 8358087..a05f20e 100644
--- a/extern/bullet2/CMakeLists.txt
+++ b/extern/bullet2/CMakeLists.txt
@@ -404,14 +404,13 @@ if(CMAKE_COMPILER_IS_GNUCXX)
 
 endif()
 
-if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+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(CMAKE_C_FLAGS_RELEASE "") # c-api uses plain basic flags
-	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -fPIC -msse3 -mssse3")
+	SET_SOURCE_FILES_PROPERTIES(src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp COMPILE_FLAGS "-O0")
 endif()
 
 blender_add_lib(extern_bullet "${SRC}" "${INC}" "${INC_SYS}")




More information about the Bf-blender-cvs mailing list