summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-03-29 15:55:07 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-04-01 08:44:15 +0000
commitdbfcea2a638d9223bb8d4d9ffc63b0d294b9f97d (patch)
treef77c3d420a3973f8565e41ec977f73de7807b53f
parent434aa248ad5710c7f65283fc3beb7e8adb8b1ad7 (diff)
Fix building with clang_cl
Clang reports itself as MSVC but doesn't allow intrinsics to be used unconditionally independent of command-line flags like MSVC does. Fixes: QTBUG-68551 Change-Id: I65d1ee1aa5c02b7c3a25c10c69c3d5e88129b858 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
-rw-r--r--src/3rdparty/libwebp/src/dsp/dsp.h6
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