diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-03-25 14:22:55 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2021-11-26 12:49:21 +0000 |
| commit | 95347c82df6c6ea1a61a58355fb723efd728bff3 (patch) | |
| tree | cf6bebf9163cdd2e954c5ae39b3b440193f62677 | |
| parent | b63527b7466be7ee76bccafdbdf57f17da50532f (diff) | |
Fix vendored libwebp to build for universal macOS
The 3rdparty NEON libwebp sources need to built for the macOS and iOS
arm64 slices when doing a universal build.
Task-number: QTBUG-85447
Change-Id: Id55e58027adbea9e3d83e1a4b7309ff36cf01453
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit b01f23ed9b32a84c5ffd6f45f08c4b81705b1979)
| -rw-r--r-- | src/3rdparty/libwebp.pri | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/3rdparty/libwebp.pri b/src/3rdparty/libwebp.pri index 22f82bf..04ac21c 100644 --- a/src/3rdparty/libwebp.pri +++ b/src/3rdparty/libwebp.pri @@ -138,7 +138,7 @@ SOURCES_FOR_NEON += \ android { arm64-v8a | armeabi-v7a: SOURCES += $$SOURCES_FOR_NEON -} else: equals(QT_ARCH, arm)|equals(QT_ARCH, arm64) { +} else:!macos: equals(QT_ARCH, arm)|equals(QT_ARCH, arm64) { contains(QT_CPU_FEATURES.$$QT_ARCH, neon) { # Default compiler settings include this feature, so just add to SOURCES SOURCES += $$SOURCES_FOR_NEON @@ -156,4 +156,7 @@ android { silent: neon_comp.commands = @echo compiling[neon] ${QMAKE_FILE_IN} && $$neon_comp.commands QMAKE_EXTRA_COMPILERS += neon_comp } +} else:macos { + CONFIG += simd + NEON_SOURCES += $$SOURCES_FOR_NEON } |