aboutsummaryrefslogtreecommitdiff
path: root/windowsRuntimeInstaller
diff options
context:
space:
mode:
authorMark Young <marky@lunarg.com>2016-01-26 13:36:28 -0700
committerMark Young <marky@lunarg.com>2016-01-26 13:36:28 -0700
commit6dcfe83d35132a8956c009e4d7d544408f8d31e6 (patch)
tree53030230123f0341ec4b621db30334bd9f2664d7 /windowsRuntimeInstaller
parentd1eeca85b40b9d0416da67e8db18e6fa263a2f36 (diff)
downloadusermoji-6dcfe83d35132a8956c009e4d7d544408f8d31e6.tar.xz
loader: Update Windows uninstall to remove 32-bit vulkaninfo.
I recently added a 32-bit vulkaninfo to the install directory so people could valiate the 32-bit loader. Unfortunately, I wasn't removing it. Thanks to David for the catch.
Diffstat (limited to 'windowsRuntimeInstaller')
-rw-r--r--windowsRuntimeInstaller/InstallerRT.nsi5
1 files changed, 5 insertions, 0 deletions
diff --git a/windowsRuntimeInstaller/InstallerRT.nsi b/windowsRuntimeInstaller/InstallerRT.nsi
index 45d5d3e3..27af2cd2 100644
--- a/windowsRuntimeInstaller/InstallerRT.nsi
+++ b/windowsRuntimeInstaller/InstallerRT.nsi
@@ -411,6 +411,11 @@ Section "uninstall"
Delete /REBOOTOK "$INSTDIR\Vulkan.ico"
Delete /REBOOTOK "$INSTDIR\ConfigLayersAndVulkanDLL.ps1"
Delete /REBOOTOK "$INSTDIR\vulkaninfo.exe"
+
+ # If running on a 64-bit OS machine
+ ${If} ${RunningX64}
+ Delete /REBOOTOK "$INSTDIR\vulkaninfo32.exe"
+ ${EndIf}
# Need to do a SetOutPath to something outside of INSTDIR,
# or the uninstall will think INSTDIR is busy