diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2014-03-18 15:16:53 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2014-03-18 15:18:03 +0400 |
| commit | 5ff0500593021f42ef9e9945f6168321b340ba9b (patch) | |
| tree | 7c5af0382ba388bb18a4d69be9678bf3e59ff538 /extern/bullet2 | |
| parent | eaf387b8df74c50388137e9c3b9986334478988a (diff) | |
OSX/cmake/bullet: fix ambigoius compiler ID and make deoptimize fix a bit stricter to reduce speed penalty
Diffstat (limited to 'extern/bullet2')
| -rw-r--r-- | extern/bullet2/CMakeLists.txt | 5 |
1 files 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}") |