diff options
| author | Maxim Nikolenko <maximnproductengine@lindenlab.com> | 2024-10-08 17:06:20 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-08 17:06:20 +0300 |
| commit | 6ccae2d0ae977965202ecb45de77e46f8d0312b3 (patch) | |
| tree | 0819595c2a50aa7066b0c75b49d3b6c31f5636b9 /indra/llmath/llsimdmath.h | |
| parent | ccc7fffb22b347149bf807b9d92677e5616c5017 (diff) | |
| parent | 3dca9fc377e855b74a78a5c30464b468dcc82644 (diff) | |
Merge branch 'develop' into maxim/lua-nearby-avatars
Diffstat (limited to 'indra/llmath/llsimdmath.h')
| -rw-r--r-- | indra/llmath/llsimdmath.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/indra/llmath/llsimdmath.h b/indra/llmath/llsimdmath.h index 40953dc2e8..592bb124c2 100644 --- a/indra/llmath/llsimdmath.h +++ b/indra/llmath/llsimdmath.h @@ -31,8 +31,15 @@ #error "Please include llmath.h before this file." #endif -#if ( ( LL_DARWIN || LL_LINUX ) && !(__SSE2__) ) || ( LL_WINDOWS && ( _M_IX86_FP < 2 && ADDRESS_SIZE == 32 ) ) -#error SSE2 not enabled. LLVector4a and related class will not compile. +// the check for this error case must be split into multiple parts +// because some versions of VS complain about '__SSE2__' +//#if ( ( LL_DARWIN || LL_LINUX ) && !(__SSE2__) ) || ( LL_WINDOWS && ( _M_IX86_FP < 2 && ADDRESS_SIZE == 32 ) ) +#if ( ( LL_DARWIN || LL_LINUX ) ) + #if !(__SSE2__) + #error SSE2 not enabled. LLVector4a and related class will not compile. + #endif +#elif ( LL_WINDOWS && ( _M_IX86_FP < 2 && ADDRESS_SIZE == 32 ) ) + #error SSE2 not enabled. LLVector4a and related class will not compile. #endif #if !LL_WINDOWS |