From 3005dc6a2462e6c4f24e1d69ab54af8a60c1d5b3 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Wed, 8 Feb 2012 00:25:24 +0100 Subject: [PATCH] nsis: Install missing msys-1.0.dll and msys-z.dll. Thanks John-Eric Kamps ("MockUp") for testing on a pristine Windows 7 (64 bit). --- contrib/sigrok-cli.nsi.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/contrib/sigrok-cli.nsi.in b/contrib/sigrok-cli.nsi.in index 2b375f5..13f2402 100644 --- a/contrib/sigrok-cli.nsi.in +++ b/contrib/sigrok-cli.nsi.in @@ -132,6 +132,10 @@ Section "@PACKAGE_NAME@ (required)" Section1 File "c:\MinGW\bin\libiconv-2.dll" File "c:\MinGW\bin\libstdc++-6.dll" + # MSYS libs. + File "c:\MinGW\msys\1.0\bin\msys-1.0.dll" + File "c:\MinGW\msys\1.0\bin\msys-z.dll" + # External libs File "c:\MinGW\msys\1.0\local\bin\libglib-2.0-0.dll" File "c:\MinGW\msys\1.0\local\bin\libgthread-2.0-0.dll" @@ -199,6 +203,8 @@ Section "Uninstall" Delete "$INSTDIR\intl.dll" Delete "$INSTDIR\libiconv-2.dll" Delete "$INSTDIR\libstdc++-6.dll" + Delete "$INSTDIR\msys-1.0.dll" + Delete "$INSTDIR\msys-z.dll" Delete "$INSTDIR\libglib-2.0-0.dll" Delete "$INSTDIR\libgthread-2.0-0.dll" Delete "$INSTDIR\libusb-1.0.dll" -- 2.30.2