From 5ff0500593021f42ef9e9945f6168321b340ba9b Mon Sep 17 00:00:00 2001 From: Jens Verwiebe Date: Tue, 18 Mar 2014 12:16:53 +0100 Subject: OSX/cmake/bullet: fix ambigoius compiler ID and make deoptimize fix a bit stricter to reduce speed penalty --- extern/bullet2/CMakeLists.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/extern/bullet2/CMakeLists.txt b/extern/bullet2/CMakeLists.txt index 83580875ccf..a05f20eab64 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}") -- cgit v1.2.3