diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2014-04-17 02:25:15 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2014-04-17 02:25:25 +0400 |
| commit | 8a4210074c0d20af7aa1fe8b03839086f3f39078 (patch) | |
| tree | 93a93f914bc29f218e8ac65824d91c45edcad7ae /extern/bullet2/CMakeLists.txt | |
| parent | 415e10a0efa96d76d73dd37ab3bc41c400120c39 (diff) | |
Bullet: better workaround for failing friction with clang 3.4, remove the obsolete compileflag magic
Diffstat (limited to 'extern/bullet2/CMakeLists.txt')
| -rw-r--r-- | extern/bullet2/CMakeLists.txt | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/extern/bullet2/CMakeLists.txt b/extern/bullet2/CMakeLists.txt index 9cb6dcdfc1a..2b2c18c0685 100644 --- a/extern/bullet2/CMakeLists.txt +++ b/extern/bullet2/CMakeLists.txt @@ -401,12 +401,6 @@ set(SRC if(CMAKE_COMPILER_IS_GNUCXX) # needed for gcc 4.6+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive") - -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") endif() blender_add_lib(extern_bullet "${SRC}" "${INC}" "${INC_SYS}") |