From 60a24bd55b2529c7478cfd701bcafb66e49d953f Mon Sep 17 00:00:00 2001 From: bkaradzic Date: Sun, 29 Dec 2013 14:31:21 -0800 Subject: [PATCH] Fixed iOS build. --- include/bx/float4_ref.h | 4 ++-- include/bx/float4_t.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/bx/float4_ref.h b/include/bx/float4_ref.h index e8667d6..8adf58f 100644 --- a/include/bx/float4_ref.h +++ b/include/bx/float4_ref.h @@ -419,7 +419,7 @@ IMPLEMENT_TEST(xyzw , 0xf); return result; } - BX_NO_INLINE float4_t float4_max(float4_t _a, float4_t _b) + BX_FLOAT4_INLINE float4_t float4_max(float4_t _a, float4_t _b) { float4_t result; result.fxyzw[0] = _a.fxyzw[0] > _b.fxyzw[0] ? _a.fxyzw[0] : _b.fxyzw[0]; @@ -539,7 +539,7 @@ IMPLEMENT_TEST(xyzw , 0xf); return result; } - BX_NO_INLINE float4_t float4_imax(float4_t _a, float4_t _b) + BX_FLOAT4_INLINE float4_t float4_imax(float4_t _a, float4_t _b) { float4_t result; result.ixyzw[0] = _a.ixyzw[0] > _b.ixyzw[0] ? _a.ixyzw[0] : _b.ixyzw[0]; diff --git a/include/bx/float4_t.h b/include/bx/float4_t.h index 504400c..9ba0283 100644 --- a/include/bx/float4_t.h +++ b/include/bx/float4_t.h @@ -12,7 +12,7 @@ #if defined(__SSE2__) || (BX_COMPILER_MSVC && (BX_ARCH_64BIT || _M_IX86_FP >= 2) ) # include "float4_sse.h" -#elif __ARM_NEON__ +#elif __ARM_NEON__ && !BX_COMPILER_CLANG # include "float4_neon.h" #else # pragma message("************************************\nUsing SIMD reference implementation!\n************************************")