blender
/
blender
137
411
Fork 594
Code Issues 6.3k Pull Requests 769 Projects 19 Wiki Activity

Bullet: making bullet friction workaround more furureproof by using the __apple_build_version__ macro, TODO: check if problem persists with newer clang

This commit is contained in:
jens verwiebe 2014-04-19 14:10:49 +02:00
parent d6a53bb38f
commit 9c93c0bf08
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverBody.h vendored
View File

@ -37,9 +37,9 @@ struct btSimdScalar
{
}
/* workaround for an clang 3.4 issue, friction would fail with forced inlining */
#if (defined(__APPLE__) && defined(__clang__) && (__clang_major__ == 5) && (__clang_minor__ == 1)) \
|| (defined(__clang__) && (__clang_major__ == 3) && (__clang_minor__ == 4))
/* workaround for clang 3.4 ( == apple clang 5.1 ) issue, friction would fail with forced inlining */
#if (defined(__clang__) && defined(__apple_build_version__) && (__clang_major__ == 5) && (__clang_minor__ == 1)) \
|| (defined(__clang__) && !defined(__apple_build_version__) && (__clang_major__ == 3) && (__clang_minor__ == 4))
inline __attribute__ ((noinline)) btSimdScalar(float fl)
#else
SIMD_FORCE_INLINE btSimdScalar(float fl)