diff options
| author | Mark Young <marky@lunarg.com> | 2016-01-15 13:12:10 -0700 |
|---|---|---|
| committer | Mark Young <marky@lunarg.com> | 2016-01-25 16:04:01 -0700 |
| commit | 36533d4449d7b19c1c75a9f38dc3e5b47c0cc4d7 (patch) | |
| tree | c1b2dc1ccadf5c937c5c5d01428fd75aad3109b3 /windowsRuntimeInstaller | |
| parent | 0c8dcac1066dd3bb5c49b155eaaa867cdee229e2 (diff) | |
| download | usermoji-36533d4449d7b19c1c75a9f38dc3e5b47c0cc4d7.tar.xz | |
Installer: Add support to install 32-bit vulkaninfo
Add support to install 32-bit vulkaninfo
Diffstat (limited to 'windowsRuntimeInstaller')
| -rw-r--r-- | windowsRuntimeInstaller/ConfigLayersAndVulkanDLL.ps1 | 1 | ||||
| -rw-r--r-- | windowsRuntimeInstaller/InstallerRT.nsi | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/windowsRuntimeInstaller/ConfigLayersAndVulkanDLL.ps1 b/windowsRuntimeInstaller/ConfigLayersAndVulkanDLL.ps1 index ce3ab233..d273c2ab 100644 --- a/windowsRuntimeInstaller/ConfigLayersAndVulkanDLL.ps1 +++ b/windowsRuntimeInstaller/ConfigLayersAndVulkanDLL.ps1 @@ -206,7 +206,6 @@ Get-ChildItem -Path Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\Curr $VulkanSdkDirs+="C:\VulkanSDK\0.9.3"
-
# Remove layer registry entries associated with all installed Vulkan SDKs.
# Note that we remove only those entries created by Vulkan SDKs. If other
# layers were installed that are not from an SDK, we don't mess with them.
diff --git a/windowsRuntimeInstaller/InstallerRT.nsi b/windowsRuntimeInstaller/InstallerRT.nsi index 8473042c..9cb1ac9a 100644 --- a/windowsRuntimeInstaller/InstallerRT.nsi +++ b/windowsRuntimeInstaller/InstallerRT.nsi @@ -290,7 +290,9 @@ Section "uninstall" # It will be deleted later when we remove the install directory. File ConfigLayersAndVulkanDLL.ps1 - # Delete vulkaninfo.exe in C:\Windows\System32 + # Delete vulkaninfo.exe in C:\Windows\System32 and C:\Windows\SysWOW64 + Delete /REBOOTOK $WINDIR\SysWow64\vulkaninfo.exe + Delete /REBOOTOK "$WINDIR\SysWow64\vulkaninfo-$FileVersion.exe" Delete /REBOOTOK $WINDIR\System32\vulkaninfo.exe Delete /REBOOTOK "$WINDIR\System32\vulkaninfo-$FileVersion.exe" |