aboutsummaryrefslogtreecommitdiffstats
path: root/coin
diff options
context:
space:
mode:
authorJoni Jäntti <joni.jantti@qt.io>2018-08-31 15:36:03 +0300
committerLiang Qi <liang.qi@qt.io>2018-09-04 08:28:55 +0000
commit7cbb032dc5cf1eef545d3a568b598c82522386db (patch)
tree3375e357f42406a636642e980527a9b4c997a4ff /coin
parent2e6a5787ef6265fb7aeb4af1384a5e3bf63ed49e (diff)
Provisioning: Fix vclib path on x86 machines
The path was incorrect for x86 Windows machines since they use "Program Files" without the "(x86)" suffix. Change-Id: Iecfee3b568a4d23b056fab230891f7eeb4d63cc8 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
Diffstat (limited to 'coin')
-rw-r--r--coin/provisioning/common/windows/vclibs_debug.ps19
1 files changed, 8 insertions, 1 deletions
diff --git a/coin/provisioning/common/windows/vclibs_debug.ps1 b/coin/provisioning/common/windows/vclibs_debug.ps1
index e9020694..ef387ab4 100644
--- a/coin/provisioning/common/windows/vclibs_debug.ps1
+++ b/coin/provisioning/common/windows/vclibs_debug.ps1
@@ -1,3 +1,5 @@
+. "$PSScriptRoot\helpers.ps1"
+
function Install-VCLibsDebug
{
Param (
@@ -10,7 +12,12 @@ function Install-VCLibsDebug
return
}
- Add-AppxPackage "C:\Program Files (x86)\Microsoft SDKs\Windows Kits\10\ExtensionSDKs\Microsoft.VCLibs\14.0\Appx\Debug\$Arch\Microsoft.VCLibs.$Arch.Debug.14.00.appx"
+ if (Is64BitWinHost) {
+ $ProgramFiles = "Program Files (x86)"
+ } else {
+ $ProgramFiles = "Program Files"
+ }
+ Add-AppxPackage "C:\$ProgramFiles\Microsoft SDKs\Windows Kits\10\ExtensionSDKs\Microsoft.VCLibs\14.0\Appx\Debug\$Arch\Microsoft.VCLibs.$Arch.Debug.14.00.appx"
Write-Host "Debug VCLibs successfully installed for $Arch."
}