Build libzip with cmake when cross building for Windows

This seems to fix our issues with being able to create zip files on the
fly (needed for the divelogs.de access).

Fixes #955

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-10-26 14:24:34 -07:00
parent 755ecf607a
commit c6ec742d11

View file

@ -224,10 +224,9 @@ if [[ ! -d libzip || -f build.libzip ]] ; then
rm -f build.libzip rm -f build.libzip
mkdir -p libzip mkdir -p libzip
cd libzip cd libzip
# cmake -DCMAKE_TOOLCHAIN_FILE="$BASEDIR"/mxe/usr/i686-w64-mingw32.shared/share/cmake/mxe-conf.cmake \ cmake -DCMAKE_TOOLCHAIN_FILE=$BASEDIR/mxe/usr/i686-w64-mingw32.shared/share/cmake/mxe-conf.cmake \
# -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
# "$BASEDIR"/libzip $BASEDIR/libzip
"$BASEDIR"/libzip/configure --host=i686-w64-mingw32.shared --prefix="$BASEDIR"/mxe/usr/i686-w64-mingw32.shared
make $JOBS make $JOBS
make install make install
fi fi