griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

OSX/bullet: do a last fix for scons. Now in both buildsystems the used flags are in sync for OSX

Browse Source
This commit is contained in:
Jens Verwiebe
2014-03-11 17:34:20 +01:00
parent 997b49a5f3
commit 4e3f27032e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extern/bullet2/CMakeLists.txt vendored
View File

@@ -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}")

4
extern/bullet2/src/SConscript vendored
View File

@@ -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 )