Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Verwiebe <info@jensverwiebe.de>2014-03-11 18:56:34 +0400
committerJens Verwiebe <info@jensverwiebe.de>2014-03-11 18:56:50 +0400
commitce37400c0b6b35acaecec91e9c80901cb8bd7546 (patch)
tree17e4d6c539b7dcf54687d1ed933e173e5d420703 /extern/bullet2
parenta2ffd8e4234e7113466b236fa6cb4ab20c9f048e (diff)
OSX/cmake: tentative fix for T38746, conflictting flags somewhere
Diffstat (limited to 'extern/bullet2')
-rw-r--r--extern/bullet2/CMakeLists.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/extern/bullet2/CMakeLists.txt b/extern/bullet2/CMakeLists.txt
index 2b2c18c0685..7129223e5d2 100644
--- a/extern/bullet2/CMakeLists.txt
+++ b/extern/bullet2/CMakeLists.txt
@@ -403,4 +403,10 @@ if(CMAKE_COMPILER_IS_GNUCXX)
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(CMAKE_C_FLAGS_RELEASE "") # c-api uses plain basic flags
+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -fPIC -msse3 -mssse3")
+endif()
+
blender_add_lib(extern_bullet "${SRC}" "${INC}" "${INC_SYS}")