]> sigrok.org Git - sigrok-cli.git/commitdiff
nsis: Install missing msys-1.0.dll and msys-z.dll.
authorUwe Hermann <redacted>
Tue, 7 Feb 2012 23:25:24 +0000 (00:25 +0100)
committerUwe Hermann <redacted>
Tue, 7 Feb 2012 23:25:24 +0000 (00:25 +0100)
Thanks John-Eric Kamps ("MockUp") for testing on a pristine
Windows 7 (64 bit).

contrib/sigrok-cli.nsi.in

index 2b375f5e5fa934299b3a2c8b4464bfa8900599cf..13f2402ad646f9c701bfabf06bc85d97e1612f20 100644 (file)
@@ -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"