diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-03-23 16:00:10 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-03-23 16:00:10 +0200 |
| commit | 1f67161fea6beb2ed4c09849abe446c6a880af8a (patch) | |
| tree | cffe8116a49f76c8e5d521af9298631e0d2a6130 /src/3rdparty/libwebp/patches/0001-Fix-Windows-build-for-clang-and-neon.patch | |
| parent | 2dcf2899b022accfef5cede1c2ea3dda2d0d6a4a (diff) | |
| parent | c4b95acf2d1da93730c7624033a17f19e239d111 (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.9' into tqtc/lts-5.15-opensourcev5.15.9-lts-lgpl
Change-Id: Ieb442937b0cc31e15b39401f2a3234b99751d169
Diffstat (limited to 'src/3rdparty/libwebp/patches/0001-Fix-Windows-build-for-clang-and-neon.patch')
| -rw-r--r-- | src/3rdparty/libwebp/patches/0001-Fix-Windows-build-for-clang-and-neon.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/src/3rdparty/libwebp/patches/0001-Fix-Windows-build-for-clang-and-neon.patch b/src/3rdparty/libwebp/patches/0001-Fix-Windows-build-for-clang-and-neon.patch new file mode 100644 index 0000000..4c5512d --- /dev/null +++ b/src/3rdparty/libwebp/patches/0001-Fix-Windows-build-for-clang-and-neon.patch @@ -0,0 +1,37 @@ +diff --git a/src/3rdparty/libwebp/src/dsp/dsp.h b/src/3rdparty/libwebp/src/dsp/dsp.h +index c4f57e4..607b2e2 100644 +--- a/src/3rdparty/libwebp/src/dsp/dsp.h ++++ b/src/3rdparty/libwebp/src/dsp/dsp.h +@@ -14,6 +14,8 @@ + #ifndef WEBP_DSP_DSP_H_ + #define WEBP_DSP_DSP_H_ + ++#include <qglobal.h> ++ + #ifdef HAVE_CONFIG_H + #include "src/webp/config.h" + #endif +@@ -70,12 +72,12 @@ extern "C" { + + #if !defined(HAVE_CONFIG_H) + #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 + #endif +@@ -122,7 +124,7 @@ extern "C" { + // Note: ARM64 is supported in Visual Studio 2017, but requires the direct + // inclusion of arm64_neon.h; Visual Studio 2019 includes this file in + // arm_neon.h. +-#if defined(_MSC_VER) && \ ++#if defined(_MSC_VER) && !defined(__clang__) && (QT_CONFIG_neon == 1) && \ + ((_MSC_VER >= 1700 && defined(_M_ARM)) || \ + (_MSC_VER >= 1920 && defined(_M_ARM64))) + #define WEBP_USE_NEON |