VER_BOOST=1.58.0
VER_QT=5.6.0
VER_QT_SHORT=5.6
-VER_SIGROK_FIRMWARE_FX2LAFW=0.1.3
+VER_SIGROK_FIRMWARE_FX2LAFW=0.1.6
VER_NDK=10e
VER_SDK=24.4.1
VER_AND_BT=23.0.2 # Android build tools version
CM="$CM -DANDROID_NDK=${ANDROID_NDK}"
CM="$CM -DANDROID_NATIVE_API_LEVEL=${NATIVE_API_LEVEL}"
CM="$CM -DANDROID_TOOLCHAIN_NAME=${TOOLCHAIN_TRIPLET}-${NDK_TOOLCHAIN_VERSION}"
+ CM="$CM -DCMAKE_MAKE_PROGRAM=${ANDROID_NDK}/prebuilt/linux-x86/bin/make"
fi
# Look for STL, needed to build bindings
cd ..
# Qt (needed for PulseView)
-$WGET http://download.qt.io/official_releases/qt/${VER_QT_SHORT}/${VER_QT}/single/qt-everywhere-opensource-src-${VER_QT}.tar.xz
+$WGET http://download.qt.io/archive/qt/${VER_QT_SHORT}/${VER_QT}/single/qt-everywhere-opensource-src-${VER_QT}.tar.xz
tar xfi qt-everywhere-opensource-src-${VER_QT}.tar.xz
cd qt-everywhere-opensource-src-${VER_QT}
patch -p1 < ../../android-qt.patch
-skip qtwebchannel \
-skip qtwebsockets \
-skip qtxmlpatterns \
- -opensource -confirm-license -silent
+ -opensource -confirm-license -silent -no-warnings-are-errors
export ANDROID_API_VERSION=android-$VER_AND_API
export ANDROID_BUILD_TOOLS_REVISION=$VER_AND_BT
make module-qtbase module-qtandroidextras module-qtsvg module-qtimageformats $PARALLEL $V