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

Cleanup: Restrict the debug -gline-tables-only to cxx_debug in cycles and spelling

Browse Source
This commit is contained in:
Jens Verwiebe
2014-03-22 11:33:21 +01:00
parent 85e0f69040
commit 877706b8eb
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
extern/bullet2/src/SConscript vendored
View File

@@ -40,9 +40,9 @@ incs = '. BulletCollision BulletDynamics LinearMath BulletSoftBody'
if sys.platform=='darwin':
if env['C_COMPILER_ID'] == 'clang' and env['CCVERSION'] >= '3.4':
# Due some bugs in bullet, clang 3.4 produces wrong code when optimized below -O0
# to avoid too much speed penalty compiling whole bullet lib non-optimized,
# we build a seperate non-optimized/optimized parts and just link together finally
# Due some bugs in bullet, clang 3.4 produces wrong code when optimized > -O0
# to avoid too much speed penalty when compiling whole bullet lib non-optimized,
# we build seperate non-optimized/optimized parts and just link together finally
bullet2_src.remove("BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp")
bullet2_fix_src = env.Glob("BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp")
env.BlenderLib ( libname = 'extern_fix_bullet2', sources=bullet2_fix_src, includes=Split(incs), defines=Split(defs), libtype=['extern','player'], priority=[20,137], cc_compileflags=bt_flags, cxx_compileflags=bt_flags )

2
intern/cycles/blender/CMakeLists.txt
View File

@@ -51,7 +51,7 @@ blender_add_lib(bf_intern_cycles "${SRC}" "${INC}" "${INC_SYS}")
# avoid link failure with clang 3.4 debug
if(CMAKE_C_COMPILER_ID MATCHES "Clang" AND NOT ${CMAKE_C_COMPILER_VERSION} VERSION_LESS '3.4')
add_definitions(-gline-tables-only)
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -gline-tables-only")
endif()
add_dependencies(bf_intern_cycles bf_rna)