doc: update sigrok-cli(1) for channel assignment to decoder inputs

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

diff --git a/contrib/sigrok-cli_cross.nsi.in b/contrib/sigrok-cli_cross.nsi.in
index 196a10740a599eed437c71484d23f801ca673118..6f60540fa19cfd31969dbacff3b624403cf3b4a6 100644 (file)
--- a/contrib/sigrok-cli_cross.nsi.in
+++ b/contrib/sigrok-cli_cross.nsi.in
@@ -1,7 +1,7 @@
 ##
 ## This file is part of the sigrok-cli project.
 ##
-## Copyright (C) 2011-2014 Uwe Hermann <uwe@hermann-uwe.de>
+## Copyright (C) 2011-2020 Uwe Hermann <uwe@hermann-uwe.de>
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -40,7 +40,11 @@ Name "@PACKAGE_NAME@"
 OutFile "@PACKAGE_NAME@-@SC_PACKAGE_VERSION@-installer.exe"
 
 # Where to install the application.
-InstallDir "$PROGRAMFILES\sigrok\@PACKAGE_NAME@"
+!ifdef PE64
+       InstallDir "$PROGRAMFILES64\sigrok\@PACKAGE_NAME@"
+!else
+       InstallDir "$PROGRAMFILES\sigrok\@PACKAGE_NAME@"
+!endif
 
 # Request admin privileges for Windows Vista and Windows 7.
 # http://nsis.sourceforge.net/Docs/Chapter4.html
@@ -129,6 +133,7 @@ Section "@PACKAGE_NAME@ (required)" Section1
        # Python
        File "${CROSS}/python34.dll"
        File "${CROSS}/python34.zip"
+       File "${CROSS}/*.pyd"
 
        SetOutPath "$INSTDIR\share"
 
@@ -236,6 +241,7 @@ Section "Uninstall"
        Delete "$INSTDIR\zadig_xp.exe"
        Delete "$INSTDIR\python34.dll"
        Delete "$INSTDIR\python34.zip"
+       Delete "$INSTDIR\*.pyd"
 
        # Delete all decoders and everything else in libsigrokdecode/.
        # There could be *.pyc files or __pycache__ subdirs and so on.