X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=cross-compile%2Fmingw%2Fsigrok-cross-mingw;h=bda4d921240d6f6cacf130dc6bd9e47c9e493e01;hb=6e6c47d09ae6db8568ecb3aa5b053271b26e4769;hp=51b75a71c38aba860163d74f0d81651f6682ddbd;hpb=fd000407bdb400d6df788072ee298d220e180e1a;p=sigrok-util.git

diff --git a/cross-compile/mingw/sigrok-cross-mingw b/cross-compile/mingw/sigrok-cross-mingw
index 51b75a7..bda4d92 100755
--- a/cross-compile/mingw/sigrok-cross-mingw
+++ b/cross-compile/mingw/sigrok-cross-mingw
@@ -2,7 +2,7 @@
 ##
 ## This file is part of the sigrok-util project.
 ##
-## Copyright (C) 2013-2018 Uwe Hermann <uwe@hermann-uwe.de>
+## Copyright (C) 2013-2020 Uwe Hermann <uwe@hermann-uwe.de>
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -148,9 +148,13 @@ if [ $TARGET = "x86_64" ]; then
 	rm -f python34.dll
 fi
 
+# We need to include the *.pyd files from python34.zip into the installers,
+# otherwise importing certain modules (e.g. ctypes) won't work (bug #1409).
+unzip -q $PREFIX/python34.zip *.pyd -d $PREFIX
+
 # Zadig (we ship this with frontends for easy driver switching).
-$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
+$WGET https://github.com/pbatard/libwdi/releases/download/b721/zadig-2.4.exe -O $PREFIX/zadig.exe
+$WGET https://github.com/pbatard/libwdi/releases/download/v1.2.5/zadig_xp-2.2.exe -O $PREFIX/zadig_xp.exe
 
 # libusb
 $GIT_CLONE git://github.com/dickens/libusb -b event-abstraction-v4