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-Url: http://sigrok.org/gitweb/?a=commitdiff_plain;h=f25f3989953538e7a96257c5d21f829030f2f3d5;p=sigrok-gtk.git

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-gtk.nsi.in b/contrib/sigrok-gtk.nsi.in
index 3d88dad..ab958e2 100644
--- a/contrib/sigrok-gtk.nsi.in
+++ b/contrib/sigrok-gtk.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"
@@ -223,6 +227,8 @@ Section "Uninstall"
 	Delete "$INSTDIR\libiconv-2.dll"
 	Delete "$INSTDIR\libstdc++-6.dll"
 	Delete "$INSTDIR\libglib-2.0-0.dll"
+	Delete "$INSTDIR\msys-1.0.dll"
+	Delete "$INSTDIR\msys-z.dll"
 	Delete "$INSTDIR\libgthread-2.0-0.dll"
 	Delete "$INSTDIR\libusb-1.0.dll"
 	Delete "$INSTDIR\zlib1.dll"