From 17b503073d5aeb505c15ef94f5af10d76898b1cf Mon Sep 17 00:00:00 2001 From: BogDan Vatra Date: Wed, 26 Jun 2019 08:46:37 +0300 Subject: Fix Android multi ABIs compilation Change-Id: I983e2559d27ab5778f0af16f659786c0d78f4338 Reviewed-by: BogDan Vatra --- src/3rdparty/libwebp.pri | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/3rdparty/libwebp.pri b/src/3rdparty/libwebp.pri index 3e839a2..6f49549 100644 --- a/src/3rdparty/libwebp.pri +++ b/src/3rdparty/libwebp.pri @@ -123,18 +123,21 @@ integrity { QMAKE_CFLAGS += -c99 } -equals(QT_ARCH, arm)|equals(QT_ARCH, arm64) { - SOURCES_FOR_NEON += \ - $$PWD/libwebp/src/dsp/alpha_processing_neon.c \ - $$PWD/libwebp/src/dsp/dec_neon.c \ - $$PWD/libwebp/src/dsp/enc_neon.c \ - $$PWD/libwebp/src/dsp/filters_neon.c \ - $$PWD/libwebp/src/dsp/lossless_enc_neon.c \ - $$PWD/libwebp/src/dsp/lossless_neon.c \ - $$PWD/libwebp/src/dsp/rescaler_neon.c \ - $$PWD/libwebp/src/dsp/upsampling_neon.c \ - $$PWD/libwebp/src/dsp/yuv_neon.c +SOURCES_FOR_NEON += \ + $$PWD/libwebp/src/dsp/alpha_processing_neon.c \ + $$PWD/libwebp/src/dsp/dec_neon.c \ + $$PWD/libwebp/src/dsp/enc_neon.c \ + $$PWD/libwebp/src/dsp/filters_neon.c \ + $$PWD/libwebp/src/dsp/lossless_enc_neon.c \ + $$PWD/libwebp/src/dsp/lossless_neon.c \ + $$PWD/libwebp/src/dsp/rescaler_neon.c \ + $$PWD/libwebp/src/dsp/upsampling_neon.c \ + $$PWD/libwebp/src/dsp/yuv_neon.c + +android { + arm64-v8a|equals(QT_ARCH, arm64): SOURCES += $$SOURCES_FOR_NEON +} else: 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 -- cgit v1.2.3