mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade 3pp for android and testing

Browse source 
Signed-off-by: Anton Lundin <glance@acc.umu.se>
This commit is contained in:
Anton Lundin 2017-06-01 17:04:53 +02:00 • committed by Dirk Hohndel
parent 2fa7e86708
commit d97055d47c
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
packaging/android/build.sh
View file

@ -39,7 +39,7 @@ SUBSURFACE_DESKTOP=OFF
# Which arch should we build for?
ARCH=arm
# Which SDK buildtools revision is used?
ANDROID_BUILDTOOLS_REVISION=23.0.3
ANDROID_BUILDTOOLS_REVISION=25.0.3
while [ "$#" -gt 0 ] ; do
case "$1" in
@ -72,7 +72,7 @@ done
export ARCH
# Configure where we can find things here
export ANDROID_NDK_ROOT=${ANDROID_NDK_ROOT-$SUBSURFACE_SOURCE/../android-ndk-r13b}
export ANDROID_NDK_ROOT=${ANDROID_NDK_ROOT-$SUBSURFACE_SOURCE/../android-ndk-r14b}
if [ -n "${QT5_ANDROID+X}" ] ; then
echo "Using Qt5 in $QT5_ANDROID"
@ -100,13 +100,13 @@ else
fi
# Which versions are we building against?
SQLITE_VERSION=3130000
SQLITE_VERSION=3190200
LIBXML2_VERSION=2.9.4
LIBXSLT_VERSION=1.1.29
LIBZIP_VERSION=1.1.3
LIBGIT2_VERSION=0.24.1
LIBGIT2_VERSION=0.25.1
LIBUSB_VERSION=1.0.20
OPENSSL_VERSION=1.0.2h
OPENSSL_VERSION=1.0.2l
LIBFTDI_VERSION=1.3
if [ "$ARCH" = "arm" ] ; then
@ -144,7 +144,7 @@ else
fi
if [ ! -e sqlite-autoconf-${SQLITE_VERSION}.tar.gz ] ; then
wget http://www.sqlite.org/2016/sqlite-autoconf-${SQLITE_VERSION}.tar.gz
wget http://www.sqlite.org/2017/sqlite-autoconf-${SQLITE_VERSION}.tar.gz
fi
if [ ! -e sqlite-autoconf-${SQLITE_VERSION} ] ; then
tar -zxf sqlite-autoconf-${SQLITE_VERSION}.tar.gz