From 36533d4449d7b19c1c75a9f38dc3e5b47c0cc4d7 Mon Sep 17 00:00:00 2001 From: Mark Young Date: Fri, 15 Jan 2016 13:12:10 -0700 Subject: [PATCH] Installer: Add support to install 32-bit vulkaninfo Add support to install 32-bit vulkaninfo --- windowsRuntimeInstaller/ConfigLayersAndVulkanDLL.ps1 | 1 - windowsRuntimeInstaller/InstallerRT.nsi | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/windowsRuntimeInstaller/ConfigLayersAndVulkanDLL.ps1 b/windowsRuntimeInstaller/ConfigLayersAndVulkanDLL.ps1 index ce3ab23..d273c2a 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 8473042..9cb1ac9 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" -- 2.7.4