From dbfcea2a638d9223bb8d4d9ffc63b0d294b9f97d Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Fri, 29 Mar 2019 15:55:07 +0100
Subject: [PATCH] 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>
---
src/3rdparty/libwebp/src/dsp/dsp.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/3rdparty/libwebp/src/dsp/dsp.h b/src/3rdparty/libwebp/src/dsp/dsp.h
index fafc2d05..0d7f3fbc 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
--
GitLab