From: Uwe Hermann <redacted>
Date: Tue, 7 Feb 2012 23:25:24 +0000 (+0100)
Subject: nsis: Install missing msys-1.0.dll and msys-z.dll.
X-Git-Tag: sigrok-cli-0.3.0~46
X-Git-Url: http://sigrok.org/gitweb/?p=sigrok-cli.git;a=commitdiff_plain;h=3005dc6a2462e6c4f24e1d69ab54af8a60c1d5b3

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).
---

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"