From 7cbb032dc5cf1eef545d3a568b598c82522386db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Fri, 31 Aug 2018 15:36:03 +0300 Subject: Provisioning: Fix vclib path on x86 machines MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The path was incorrect for x86 Windows machines since they use "Program Files" without the "(x86)" suffix. Change-Id: Iecfee3b568a4d23b056fab230891f7eeb4d63cc8 Reviewed-by: Oliver Wolff Reviewed-by: Johanna Äijälä --- coin/provisioning/common/windows/vclibs_debug.ps1 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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." } -- cgit v1.2.3