X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=contrib%2Fpulseview_cross.nsi;h=a550d50bc066066eabc058a6b2d38392a2ba97c4;hb=d40f4db76fc8120fcd54ace8c6fce63387e025ca;hp=3c39351294633e6943df4dd855413cd0357b6bf8;hpb=744905d4ec6a05b53c17efb393a0ef907d95ebe2;p=pulseview.git diff --git a/contrib/pulseview_cross.nsi b/contrib/pulseview_cross.nsi index 3c393512..a550d50b 100644 --- a/contrib/pulseview_cross.nsi +++ b/contrib/pulseview_cross.nsi @@ -128,10 +128,7 @@ Section "PulseView (required)" Section1 # PulseView (statically linked, includes all libs). File "${CROSS}/bin/pulseview.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" @@ -170,6 +167,16 @@ Section "PulseView (required)" Section1 "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0 \ SW_SHOWNORMAL "" "Uninstall PulseView" + # Create a shortcut for the Zadig executable. + CreateShortCut "$SMPROGRAMS\sigrok\PulseView\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\PulseView\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" "PulseView" WriteRegStr HKLM "${REGSTR}" "UninstallString" \ @@ -206,7 +213,6 @@ Section "Uninstall" # Delete the application, the application data, and related libs. Delete "$INSTDIR\COPYING" Delete "$INSTDIR\pulseview.exe" - Delete "$INSTDIR\libusb0.dll" Delete "$INSTDIR\zadig.exe" Delete "$INSTDIR\zadig_xp.exe" Delete "$INSTDIR\python32.dll" @@ -231,6 +237,8 @@ Section "Uninstall" # Delete the links from the start menu. Delete "$SMPROGRAMS\sigrok\PulseView\PulseView.lnk" Delete "$SMPROGRAMS\sigrok\PulseView\Uninstall.lnk" + Delete "$SMPROGRAMS\sigrok\PulseView\Zadig.lnk" + Delete "$SMPROGRAMS\sigrok\PulseView\Zadig (Win XP).lnk" # Delete the sub-directory in the start menu. RMDir "$SMPROGRAMS\sigrok\PulseView"