diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2014-03-11 20:34:20 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2014-03-11 20:34:31 +0400 |
| commit | 4e3f27032e86a9e04af87a4c6881f2f54de01f1a (patch) | |
| tree | 1955ea8f34d3e8ba9cbc5381a48326f1b2a30db6 /extern | |
| parent | 997b49a5f30ee0c1862d165530321811e5977d9d (diff) | |
OSX/bullet: do a last fix for scons. Now in both buildsystems the used flags are in sync for OSX
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/bullet2/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | extern/bullet2/src/SConscript | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/extern/bullet2/CMakeLists.txt b/extern/bullet2/CMakeLists.txt index 7129223e5d2..e8169521599 100644 --- a/extern/bullet2/CMakeLists.txt +++ b/extern/bullet2/CMakeLists.txt @@ -406,7 +406,7 @@ 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(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -fPIC -msse3 -mssse3 -ffast-math") endif() blender_add_lib(extern_bullet "${SRC}" "${INC}" "${INC_SYS}") diff --git a/extern/bullet2/src/SConscript b/extern/bullet2/src/SConscript index 5c267cbd477..c1e859268b8 100644 --- a/extern/bullet2/src/SConscript +++ b/extern/bullet2/src/SConscript @@ -19,7 +19,7 @@ elif env['OURPLATFORM'] in ('linux', 'freebsd4', 'freebsd5'): cflags += ['-O2'] elif sys.platform=='darwin': defs += ' NDEBUG' - cflags += ['-O2','-pipe', '-fPIC', '-funsigned-char', '-ffast-math'] + bt_cxx_flags = env['CXXFLAGS'] + ['-fPIC', '-msse3', '-mssse3', '-ffast-math'] bullet2_src = env.Glob("LinearMath/*.cpp") bullet2_src += env.Glob("BulletCollision/BroadphaseCollision/*.cpp") @@ -38,6 +38,6 @@ bullet2_src += env.Glob("BulletSoftBody/*.cpp") incs = '. BulletCollision BulletDynamics LinearMath BulletSoftBody' if sys.platform=='darwin': - env.BlenderLib ( libname = 'extern_bullet2', sources=bullet2_src, includes=Split(incs), defines=Split(defs), libtype=['extern','player'], priority=[20,137], cxx_compileflags=cflags ) + env.BlenderLib ( libname = 'extern_bullet2', sources=bullet2_src, includes=Split(incs), defines=Split(defs), libtype=['extern','player'], priority=[20,137], cc_compileflags=env['CCFLAGS'], cxx_compileflags=bt_cxx_flags ) else: env.BlenderLib ( libname = 'extern_bullet2', sources=bullet2_src, includes=Split(incs), defines=Split(defs), libtype=['extern','player'], priority=[20,137], compileflags=cflags ) |