diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2014-04-17 02:25:15 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2014-04-17 02:25:25 +0400 |
| commit | 8a4210074c0d20af7aa1fe8b03839086f3f39078 (patch) | |
| tree | 93a93f914bc29f218e8ac65824d91c45edcad7ae /extern/bullet2/src/BulletDynamics | |
| parent | 415e10a0efa96d76d73dd37ab3bc41c400120c39 (diff) | |
Bullet: better workaround for failing friction with clang 3.4, remove the obsolete compileflag magic
Diffstat (limited to 'extern/bullet2/src/BulletDynamics')
| -rw-r--r-- | extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverBody.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverBody.h b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverBody.h index 27ccefe4169..1a6b1871f7e 100644 --- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverBody.h +++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverBody.h @@ -37,8 +37,13 @@ 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)) + inline __attribute__ ((noinline)) btSimdScalar(float fl) +#else SIMD_FORCE_INLINE btSimdScalar(float fl) +#endif :m_vec128 (_mm_set1_ps(fl)) { } |