X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fmingw%2Fsigrok-cross-mingw;h=bda4d921240d6f6cacf130dc6bd9e47c9e493e01;hp=784cd89f2cd0d3e4d22955ee97afeaf71adb8106;hb=e6891272650fd7940b8e8996a51d64c0b2d262f4;hpb=a5921d6c1533f2e0349a587dc693cf820beb8d47 diff --git a/cross-compile/mingw/sigrok-cross-mingw b/cross-compile/mingw/sigrok-cross-mingw index 784cd89..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 +## Copyright (C) 2013-2020 Uwe Hermann ## ## 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,6 +148,10 @@ 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 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