X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=contrib%2Fpulseview_cross.nsi.in;h=1cbd9eb1630741384d80756ab3fe0f51a8b8f9c6;hp=fdcdf49ebf667e406192de01869e04d65c30d885;hb=HEAD;hpb=a53b8efe3024859ff691b288833820985b032522

diff --git a/contrib/pulseview_cross.nsi.in b/contrib/pulseview_cross.nsi.in
index fdcdf49e..1cbd9eb1 100644
--- a/contrib/pulseview_cross.nsi.in
+++ b/contrib/pulseview_cross.nsi.in
@@ -1,7 +1,7 @@
 ##
 ## This file is part of the PulseView project.
 ##
-## Copyright (C) 2013-2014 Uwe Hermann <uwe@hermann-uwe.de>
+## Copyright (C) 2013-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
@@ -43,7 +43,11 @@ Name "PulseView"
 OutFile "pulseview-@PV_VERSION_STRING@-installer.exe"
 
 # Where to install the application.
-InstallDir "$PROGRAMFILES\sigrok\PulseView"
+!ifdef PE64
+	InstallDir "$PROGRAMFILES64\sigrok\PulseView"
+!else
+	InstallDir "$PROGRAMFILES\sigrok\PulseView"
+!endif
 
 # Request admin privileges for Windows Vista and Windows 7.
 # http://nsis.sourceforge.net/Docs/Chapter4.html
@@ -160,6 +164,7 @@ Section "PulseView (required)" Section1
 	# Python
 	File "${CROSS}/python34.dll"
 	File "${CROSS}/python34.zip"
+	File "${CROSS}/*.pyd"
 
 	SetOutPath "$INSTDIR\share"
 
@@ -183,6 +188,12 @@ Section "PulseView (required)" Section1
 		0 SW_SHOWNORMAL \
 		"" "Open-source, portable sigrok GUI"
 
+	# Create a shortcut for the PulseView application in "safe mode".
+	CreateShortCut "$SMPROGRAMS\sigrok\PulseView\PulseView (Safe Mode).lnk" \
+		"$INSTDIR\pulseview.exe" "-c -D" "$INSTDIR\pulseview.exe" \
+		0 SW_SHOWNORMAL \
+		"" "Open-source, portable sigrok GUI (Safe Mode)"
+
 	# Create a shortcut for the PulseView application running in debug mode.
 	CreateShortCut "$SMPROGRAMS\sigrok\PulseView\PulseView (Debug).lnk" \
 		"$INSTDIR\pulseview.exe" "-l 5" "$INSTDIR\pulseview.exe" \
@@ -272,6 +283,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.
@@ -294,6 +306,7 @@ Section "Uninstall"
 
 	# Delete the links from the start menu.
 	Delete "$SMPROGRAMS\sigrok\PulseView\PulseView.lnk"
+	Delete "$SMPROGRAMS\sigrok\PulseView\PulseView (Safe Mode).lnk"
 	Delete "$SMPROGRAMS\sigrok\PulseView\PulseView (Debug).lnk"
 	Delete "$SMPROGRAMS\sigrok\PulseView\Uninstall PulseView.lnk"
 	Delete "$SMPROGRAMS\sigrok\PulseView\Zadig (PulseView).lnk"