diff options
| author | Paul Wicking <paul.wicking@qt.io> | 2019-08-06 11:34:34 +0200 |
|---|---|---|
| committer | Paul Wicking <paul.wicking@qt.io> | 2019-08-06 11:34:34 +0200 |
| commit | efe5998c3d9121e18660f3105b9ae144c3232ff5 (patch) | |
| tree | 2bde56d86da21887b957fafd56be8c332ccd75d0 | |
| parent | 633522cb007f41bf37de996cf12bd93b3bf744c0 (diff) | |
| parent | d72ff0cd09eda68a0579dc57389ecc1ee4a3b7c8 (diff) | |
Merge 5.13 into 5.13.1v5.13.1
Change-Id: I569b9f05bdc70563107c0cd9c9a12812fbd52198
| -rw-r--r-- | src/3rdparty/libwebp/src/dsp/dsp.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/3rdparty/libwebp/src/dsp/dsp.h b/src/3rdparty/libwebp/src/dsp/dsp.h index fafc2d0..0d7f3fb 100644 --- a/src/3rdparty/libwebp/src/dsp/dsp.h +++ b/src/3rdparty/libwebp/src/dsp/dsp.h @@ -55,12 +55,12 @@ extern "C" { #if !defined(EMSCRIPTEN) #if defined(_MSC_VER) && _MSC_VER > 1310 && \ - (defined(_M_X64) || defined(_M_IX86)) + (defined(_M_X64) || defined(_M_IX86)) && !defined(__clang__) #define WEBP_MSC_SSE2 // Visual C++ SSE2 targets #endif #if defined(_MSC_VER) && _MSC_VER >= 1500 && \ - (defined(_M_X64) || defined(_M_IX86)) + (defined(_M_X64) || defined(_M_IX86)) && !defined(__clang__) #define WEBP_MSC_SSE41 // Visual C++ SSE4.1 targets #endif @@ -90,7 +90,7 @@ extern "C" { #define WEBP_USE_NEON #endif -#if defined(_MSC_VER) && _MSC_VER >= 1700 && defined(_M_ARM) +#if defined(_MSC_VER) && _MSC_VER >= 1700 && defined(_M_ARM) && !defined(__clang__) #define WEBP_USE_NEON #define WEBP_USE_INTRINSICS #endif |