diff options
| author | David Pinedo <david@lunarg.com> | 2016-03-29 16:29:00 -0600 |
|---|---|---|
| committer | David Pinedo <david@lunarg.com> | 2016-03-29 16:31:38 -0600 |
| commit | 14287499aaa790038a243e56132cc7d73fb4d90d (patch) | |
| tree | ccd4f84f8825360189382d5f3333dd27b158ea6e /windowsRuntimeInstaller | |
| parent | 57ddf9a5368ce3317199d131e6bfb84e5903b170 (diff) | |
| download | usermoji-14287499aaa790038a243e56132cc7d73fb4d90d.tar.xz | |
winrtinstaller: removed vulkaninfo from RT Start Menu
Diffstat (limited to 'windowsRuntimeInstaller')
| -rw-r--r-- | windowsRuntimeInstaller/InstallerRT.nsi | 38 |
1 files changed, 3 insertions, 35 deletions
diff --git a/windowsRuntimeInstaller/InstallerRT.nsi b/windowsRuntimeInstaller/InstallerRT.nsi index 791b9b51..c51c7cc6 100644 --- a/windowsRuntimeInstaller/InstallerRT.nsi +++ b/windowsRuntimeInstaller/InstallerRT.nsi @@ -385,14 +385,10 @@ Section ${StrRep} $0 ${VERSION_BUILDNO} "." "-" StrCpy $FileVersion ${VERSION_ABI_MAJOR}-${VERSION_API_MAJOR}-${VERSION_MINOR}-${VERSION_PATCH}-$0 - # Remove vulkaninfo from Start Menu + # Complete remove the Vulkan Start Menu. Prior version of the Vulkan RT + # created Start Menu items, we don't do that anymore. SetShellVarContext all - Delete "$SMPROGRAMS\Vulkan\vulkaninfo32.lnk" - Delete "$SMPROGRAMS\Vulkan\vulkaninfo.lnk" - ClearErrors - - # Create Vulkan in the Start Menu - CreateDirectory "$SMPROGRAMS\Vulkan" + RmDir /R "$SMPROGRAMS\Vulkan" ClearErrors # If running on a 64-bit OS machine @@ -466,13 +462,6 @@ Section # by the uninstaller when it needs to be run again during uninstall. Delete ConfigLayersAndVulkanDLL.ps1 - # Add vulkaninfo to Start Menu - SetShellVarContext all - IfFileExists $WINDIR\System32\vulkaninfo.exe 0 +2 - CreateShortCut "$SMPROGRAMS\Vulkan\vulkaninfo.lnk" "$WINDIR\System32\vulkaninfo.exe" - IfFileExists $WINDIR\SysWow64\vulkaninfo.exe 0 +2 - CreateShortCut "$SMPROGRAMS\Vulkan\vulkaninfo32.lnk" "$WINDIR\SysWow64\vulkaninfo.exe" - # Possibly install MSVC 2013 redistributables ClearErrors ${If} ${RunningX64} @@ -622,27 +611,6 @@ Section "uninstall" # If Ref Count is zero, uninstall everything ${If} $IC <= 0 - # Delete vulkaninfo from start menu. - SetShellVarContext all - Delete "$SMPROGRAMS\Vulkan\vulkaninfo.lnk" - - # If running on a 64-bit OS machine - ${If} ${RunningX64} - Delete "$SMPROGRAMS\Vulkan\vulkaninfo32.lnk" - ${EndIf} - - # Possibly add vulkaninfo to Start Menu - SetShellVarContext all - IfFileExists $WINDIR\System32\vulkaninfo.exe 0 +2 - CreateShortCut "$SMPROGRAMS\Vulkan\vulkaninfo.lnk" "$WINDIR\System32\vulkaninfo.exe" - IfFileExists $WINDIR\SysWow64\vulkaninfo.exe 0 +2 - CreateShortCut "$SMPROGRAMS\Vulkan\vulkaninfo32.lnk" "$WINDIR\SysWow64\vulkaninfo.exe" - - # Possibly delete vulkan Start Menu - StrCpy $0 "$SMPROGRAMS\Vulkan" - Call un.DeleteDirIfEmpty - ClearErrors - # Remove files in install dir Delete /REBOOTOK "$IDir\VULKANRT_LICENSE.rtf" Delete /REBOOTOK "$IDir\LICENSE.txt" |