mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-30 22:20:21 +00:00
android-build: Add some more libzip hacks
This hacks the libzip build to not try to find zlib, because it fails doing so on modern NDK. We just tell it that its there, and be done with it. Signed-off-by: Anton Lundin <glance@acc.umu.se>
This commit is contained in:
parent
e68891d776
commit
a30e6b306f
1 changed files with 3 additions and 0 deletions
|
@ -281,6 +281,7 @@ if [ "$QUICK" = "" ] ; then
|
|||
sed -i 's/SIZEOF_SIZE_T/__SIZEOF_SIZE_T__/g' lib/compat.h
|
||||
# also, don't deal with manuals and bzip2
|
||||
sed -i 's/ADD_SUBDIRECTORY(man)//' CMakeLists.txt
|
||||
sed -i 's/^FIND_PACKAGE(ZLIB/#&/' CMakeLists.txt
|
||||
popd
|
||||
mkdir -p libzip-build-"$ARCH"
|
||||
pushd libzip-build-"$ARCH"
|
||||
|
@ -291,6 +292,8 @@ if [ "$QUICK" = "" ] ; then
|
|||
-DCMAKE_INSTALL_LIBDIR="lib" \
|
||||
-DBUILD_SHARED_LIBS=OFF \
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE \
|
||||
-DZLIB_VERSION_STRING=1.2.7 \
|
||||
-DZLIB_LIBRARY=z \
|
||||
../libzip/
|
||||
make
|
||||
make install
|
||||
|
|
Loading…
Reference in a new issue