diff options
| author | Lenny Komow <lenny@lunarg.com> | 2016-07-07 16:45:34 -0600 |
|---|---|---|
| committer | Lenny Komow <lenny@lunarg.com> | 2016-07-07 16:45:47 -0600 |
| commit | d5b4d2ed9b5b6066e93e2df630cc7f38937b3b3c (patch) | |
| tree | 39a3eabd57eab663063d9cbafdc5e987620c48c0 /windowsRuntimeInstaller | |
| parent | 1199671fd7808263f3686886c0685c3817d364aa (diff) | |
| download | usermoji-d5b4d2ed9b5b6066e93e2df630cc7f38937b3b3c.tar.xz | |
winsdk: Fix error when installing from syswow64
Diffstat (limited to 'windowsRuntimeInstaller')
| -rw-r--r-- | windowsRuntimeInstaller/ConfigLayersAndVulkanDLL.ps1 | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/windowsRuntimeInstaller/ConfigLayersAndVulkanDLL.ps1 b/windowsRuntimeInstaller/ConfigLayersAndVulkanDLL.ps1 index 341df5f9..3eadbfd6 100644 --- a/windowsRuntimeInstaller/ConfigLayersAndVulkanDLL.ps1 +++ b/windowsRuntimeInstaller/ConfigLayersAndVulkanDLL.ps1 @@ -359,6 +359,7 @@ function UpdateVulkanSysFolder([string]$dir, [int]$writeSdkName) # We only care about SYSWOW64 if we're targeting a 64-bit OS
if ($ossize -eq 64) {
+
# Update the SYSWOW64 Vulkan DLLS/EXEs
WriteToLog "Calling UpdateVulkanSysFolder $winfolder\SYSWOW64 0"
UpdateVulkanSysFolder $winfolder\SYSWOW64 0
@@ -368,12 +369,26 @@ if ($ossize -eq 64) { }
}
-# Update the SYSTEM32 Vulkan DLLS/EXEs
-WriteToLog "Calling UpdateVulkanSysFolder $winfolder\SYSTEM32 1"
-UpdateVulkanSysFolder $winfolder\SYSTEM32 1
-if (!$?) {
- WriteToLog "Error: Calling UpdateVulkanSysFolder for all OS"
- setScriptReturnValue(80)
+# If this is a 64 bit OS and a 32 bit powershell
+if (($ossize -eq 64 ) -and ([IntPtr]::size -eq 4)) {
+
+ # Update the SYSTEM32 Vulkan DLLS/EXEs
+ WriteToLog "Calling UpdateVulkanSysFolder $winfolder\SYSTEM32 1"
+ UpdateVulkanSysFolder $winfolder\SYSNATIVE 1
+ if (!$?) {
+ WriteToLog "Error: Calling UpdateVulkanSysFolder for all OS"
+ setScriptReturnValue(80)
+ }
+
+} else {
+
+ # Update the SYSTEM32 Vulkan DLLS/EXEs
+ WriteToLog "Calling UpdateVulkanSysFolder $winfolder\SYSTEM32 1"
+ UpdateVulkanSysFolder $winfolder\SYSTEM32 1
+ if (!$?) {
+ WriteToLog "Error: Calling UpdateVulkanSysFolder for all OS"
+ setScriptReturnValue(81)
+ }
}
# Create an array of vulkan sdk install dirs
|