From 342068fe3859e16324387de299a4462c376cab8b Mon Sep 17 00:00:00 2001 From: Nate Bargmann Date: Tue, 10 Dec 2013 20:05:00 -0600 Subject: [PATCH] Restore inclusion of libusb.dll Also add libgcc_s_sjlj-1.dll required since Debian's MinGW was upgraded to GCC 4.8. --- scripts/build-win32.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/build-win32.sh b/scripts/build-win32.sh index d60890835..7f52e3b6c 100644 --- a/scripts/build-win32.sh +++ b/scripts/build-win32.sh @@ -223,6 +223,10 @@ ${HOST_ARCH_STRIP} ${ZIP_DIR}/bin/*.exe ${ZIP_DIR}/bin/*hamlib-*.dll # Copy needed third party DLLs cp -a /usr/i686-w64-mingw32/lib/libwinpthread-1.dll ${ZIP_DIR}/bin/. +cp -a ${LIBUSB_WIN32_BIN_PATH}/bin/x86/libusb0_x86.dll ${ZIP_DIR}/bin/libusb0.dll + +# Required for MinGW with GCC 4.8 +cp -a /usr/lib/gcc/i686-w64-mingw32/4.8/libgcc_s_sjlj-1.dll ${ZIP_DIR}/bin/libgcc_s_sjlj-1.dll # Need VC++ free toolkit installed (default Wine directory installation shown) ( cd ${ZIP_DIR}/lib/msvc/ && wine ~/.wine/drive_c/Program\ Files/Microsoft\ Visual\ C++\ Toolkit\ 2003/bin/link.exe /lib /machine:i386 /def:libhamlib-2.def )