X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fmingw%2Fsigrok-cross-mingw;h=e7cd23573ab936aaf88186091cdddc24906924e5;hp=16be9973151d41a1e53031f180cfb320d981834c;hb=533e3e6c5286f6def5f31a58964047936910f94e;hpb=5d7aeed5d68238f4bcae4b1c2ac0325ac629f039 diff --git a/cross-compile/mingw/sigrok-cross-mingw b/cross-compile/mingw/sigrok-cross-mingw index 16be997..e7cd235 100755 --- a/cross-compile/mingw/sigrok-cross-mingw +++ b/cross-compile/mingw/sigrok-cross-mingw @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh ## ## This file is part of the sigrok-util project. ## @@ -40,11 +40,9 @@ PARALLEL="-j 2" # ----------------------------------------------------------------------------- -VER_ZADIG=v2.0.1.160 - SF_MIRROR=switch.dl.sourceforge.net -WGET="wget --quiet" +WGET="wget -c --quiet" GIT_CLONE="git clone --depth=1" # ----------------------------------------------------------------------------- @@ -60,7 +58,7 @@ C="--host=$TOOLCHAIN_TRIPLET --prefix=$PREFIX" CM="-DCMAKE_TOOLCHAIN_FILE=$MXE/usr/$TOOLCHAIN_TRIPLET/share/cmake/mxe-conf.cmake" L="--disable-shared --enable-static" -if [ $TARGET == "i686" ]; then +if [ $TARGET = "i686" ]; then export PKG_CONFIG_PATH_i686_w64_mingw32_static="$P:$P2" else export PKG_CONFIG_PATH_x86_64_w64_mingw32_static="$P:$P2" @@ -110,11 +108,8 @@ $WGET http://www.sigrok.org/tmp/python32_$TARGET.dll -O $PREFIX/python32.dll $WGET http://www.sigrok.org/tmp/python32_$TARGET.zip -O $PREFIX/python32.zip # Zadig (we ship this with frontends for easy driver switching). -$WGET -c http://$SF_MIRROR/project/libwdi/zadig/zadig_$VER_ZADIG.7z -$WGET -c http://$SF_MIRROR/project/libwdi/zadig/zadig_xp_$VER_ZADIG.7z -7zr e zadig_$VER_ZADIG.7z -7zr e zadig_xp_$VER_ZADIG.7z -cp -f zadig.exe zadig_xp.exe $PREFIX +$WGET http://zadig.akeo.ie/downloads/zadig.exe -O $PREFIX/zadig.exe +$WGET http://zadig.akeo.ie/downloads/zadig_xp.exe -O $PREFIX/zadig_xp.exe # libserialport $GIT_CLONE git://sigrok.org/libserialport