X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=contrib%2Fsigrok-cli_cross.nsi.in;h=7a9ec7eaf1a8e6c6529e768277f693a982ece1b7;hp=e7172bdef61b8f28a98a82fcc1e3019bc9ff14ee;hb=ee639fb40fa43aa3553ef0229def9bcdb8338c2b;hpb=0b34fecd023e6b2d2fd70e67c6c4f59bb06e299b

diff --git a/contrib/sigrok-cli_cross.nsi.in b/contrib/sigrok-cli_cross.nsi.in
index e7172bd..7a9ec7e 100644
--- a/contrib/sigrok-cli_cross.nsi.in
+++ b/contrib/sigrok-cli_cross.nsi.in
@@ -128,10 +128,7 @@ Section "@PACKAGE_NAME@ (required)" Section1
 	# sigrok-cli.exe.
 	File "${CROSS}/bin/@PACKAGE_NAME@.exe"
 
-	# libusb0.dll (needed for libusb-0.1).
-	File "${CROSS}/libusb0.dll"
-
-	# Zadig (used for installing libusb-win32 and WinUSB drivers).
+	# Zadig (used for installing WinUSB drivers).
 	File "${CROSS}/zadig.exe"
 	File "${CROSS}/zadig_xp.exe"
 
@@ -173,6 +170,16 @@ Section "@PACKAGE_NAME@ (required)" Section1
 		"$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0 \
 		SW_SHOWNORMAL "" "Uninstall @PACKAGE_NAME@"
 
+	# Create a shortcut for the Zadig executable.
+	CreateShortCut "$SMPROGRAMS\sigrok\@PACKAGE_NAME@\Zadig.lnk" \
+		"$INSTDIR\zadig.exe" "" "$INSTDIR\zadig.exe" 0 \
+		SW_SHOWNORMAL "" "Zadig"
+
+	# Create a shortcut for the Zadig executable (for Win XP).
+	CreateShortCut "$SMPROGRAMS\sigrok\@PACKAGE_NAME@\Zadig (Win XP).lnk" \
+		"$INSTDIR\zadig_xp.exe" "" "$INSTDIR\zadig_xp.exe" 0 \
+		SW_SHOWNORMAL "" "Zadig (Win XP)"
+
 	# Create registry keys for "Add/remove programs" in the control panel.
 	WriteRegStr HKLM "${REGSTR}" "DisplayName" "@PACKAGE_STRING@"
 	WriteRegStr HKLM "${REGSTR}" "UninstallString" \
@@ -211,7 +218,6 @@ Section "Uninstall"
 	# Delete the application, the application data, and related libs.
 	Delete "$INSTDIR\COPYING"
 	Delete "$INSTDIR\@PACKAGE_NAME@.exe"
-	Delete "$INSTDIR\libusb0.dll"
 	Delete "$INSTDIR\zadig.exe"
 	Delete "$INSTDIR\zadig_xp.exe"
 	Delete "$INSTDIR\python32.dll"
@@ -236,6 +242,8 @@ Section "Uninstall"
 	# Delete the links from the start menu.
 	Delete "$SMPROGRAMS\sigrok\@PACKAGE_NAME@\sigrok command-line tool.lnk"
 	Delete "$SMPROGRAMS\sigrok\@PACKAGE_NAME@\Uninstall.lnk"
+	Delete "$SMPROGRAMS\sigrok\@PACKAGE_NAME@\Zadig.lnk"
+	Delete "$SMPROGRAMS\sigrok\@PACKAGE_NAME@\Zadig (Win XP).lnk"
 
 	# Delete the sub-directory in the start menu.
 	RMDir "$SMPROGRAMS\sigrok\@PACKAGE_NAME@"