mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-28 05:00:20 +00:00
Android: build libzip 1.1.3
Switching to GitHub as source for libzip means that we need to encode the version number differently. Newer versions of libzip don't compile cleanly on Android and this one seems new enough. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
8df6789a9d
commit
93983b7e4c
2 changed files with 7 additions and 2 deletions
|
@ -218,7 +218,12 @@ fi
|
|||
if [ ! -e "$PKG_CONFIG_LIBDIR/libzip.pc" ] ; then
|
||||
mkdir -p libzip-build-"$ARCH"
|
||||
pushd libzip-build-"$ARCH"
|
||||
../libzip/configure --host=${BUILDCHAIN} --prefix="$PREFIX" --enable-static --disable-shared
|
||||
cmake \
|
||||
-DCMAKE_C_COMPILER="$CC" \
|
||||
-DCMAKE_LINKER="$CC" \
|
||||
-DCMAKE_INSTALL_PREFIX="$PREFIX" \
|
||||
-DBUILD_SHARED_LIBS=OFF \
|
||||
../libzip/
|
||||
make
|
||||
make install
|
||||
popd
|
||||
|
|
|
@ -100,7 +100,7 @@ fi
|
|||
|
||||
# FIX FOR ANDROID,
|
||||
if [ "$PLATFORM" == "singleAndroid" ] ; then
|
||||
CURRENT_LIBZIP="1.1.3"
|
||||
CURRENT_LIBZIP="rel-1-1-3"
|
||||
CURRENT_OPENSSL="OpenSSL_1_0_2o"
|
||||
# If changing the openSSL version here, make sure to change it in versions.sh also.
|
||||
fi
|
||||
|
|
Loading…
Reference in a new issue