From c6ec742d113f609604fc5fb76dcb2a214a50f3d8 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Mon, 26 Oct 2015 14:24:34 -0700 Subject: 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 --- packaging/windows/mxe-based-build.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'packaging/windows') diff --git a/packaging/windows/mxe-based-build.sh b/packaging/windows/mxe-based-build.sh index ec9deee91..1f0898b02 100755 --- a/packaging/windows/mxe-based-build.sh +++ b/packaging/windows/mxe-based-build.sh @@ -224,10 +224,9 @@ if [[ ! -d libzip || -f build.libzip ]] ; then rm -f build.libzip mkdir -p libzip cd libzip -# cmake -DCMAKE_TOOLCHAIN_FILE="$BASEDIR"/mxe/usr/i686-w64-mingw32.shared/share/cmake/mxe-conf.cmake \ -# -DCMAKE_BUILD_TYPE=Release \ -# "$BASEDIR"/libzip - "$BASEDIR"/libzip/configure --host=i686-w64-mingw32.shared --prefix="$BASEDIR"/mxe/usr/i686-w64-mingw32.shared + cmake -DCMAKE_TOOLCHAIN_FILE=$BASEDIR/mxe/usr/i686-w64-mingw32.shared/share/cmake/mxe-conf.cmake \ + -DCMAKE_BUILD_TYPE=Release \ + $BASEDIR/libzip make $JOBS make install fi -- cgit v1.2.3-70-g09d2