diff options
Diffstat (limited to 'src/3rdparty/libwebp/src/dsp/dsp.h')
| -rw-r--r-- | src/3rdparty/libwebp/src/dsp/dsp.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/3rdparty/libwebp/src/dsp/dsp.h b/src/3rdparty/libwebp/src/dsp/dsp.h index 35085e0..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 @@ -119,7 +121,12 @@ extern "C" { #define WEBP_USE_NEON #endif -#if defined(_MSC_VER) && _MSC_VER >= 1700 && defined(_M_ARM) && !defined(__clang__) +// 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) && !defined(__clang__) && (QT_CONFIG_neon == 1) && \ + ((_MSC_VER >= 1700 && defined(_M_ARM)) || \ + (_MSC_VER >= 1920 && defined(_M_ARM64))) #define WEBP_USE_NEON #define WEBP_USE_INTRINSICS #endif |