nsis: Install missing msys-1.0.dll and msys-z.dll.

[sigrok-cli.git] / contrib / sigrok-cli.nsi.in

diff --git a/contrib/sigrok-cli.nsi.in b/contrib/sigrok-cli.nsi.in
index 083db4a3ab4e897421a9d4fcae8953688e49fa9f..13f2402ad646f9c701bfabf06bc85d97e1612f20 100644 (file)
--- a/contrib/sigrok-cli.nsi.in
+++ b/contrib/sigrok-cli.nsi.in
@@ -41,8 +41,9 @@ OutFile "@PACKAGE_NAME@-installer-@PACKAGE_VERSION@.exe"
 # Where to install the application.
 InstallDir "$PROGRAMFILES\sigrok\@PACKAGE_NAME@"
 
-# Request application privileges for Windows Vista.
-RequestExecutionLevel user
+# Request admin privileges for Windows Vista and Windows 7.
+# http://nsis.sourceforge.net/Docs/Chapter4.html
+RequestExecutionLevel admin
 
 
 # --- MUI interface configuration ---------------------------------------------
@@ -131,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"
@@ -198,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"