loader: Update Windows uninstall to remove 32-bit vulkaninfo.
authorMark Young <marky@lunarg.com>
Tue, 26 Jan 2016 20:36:28 +0000 (13:36 -0700)
committerMark Young <marky@lunarg.com>
Tue, 26 Jan 2016 20:36:28 +0000 (13:36 -0700)
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.

windowsRuntimeInstaller/InstallerRT.nsi

index 45d5d3e..27af2cd 100644 (file)
@@ -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