From 675deb147463a9354aebd4a487783a41d578917c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johanna=20=C3=84ij=C3=A4l=C3=A4?= Date: Fri, 8 Mar 2019 07:41:10 -0800 Subject: Add Squish for MSVC2017 x64 to Win10 x64 machines Also Squish for MinGW x86 on Win7 x86. Change-Id: Ie73371b7993f94f32ef1cd2b90f340cf20935e0b Reviewed-by: Heikki Halmet --- coin/provisioning/common/windows/squishInstall.ps1 | 3 +++ 1 file changed, 3 insertions(+) (limited to 'coin') diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index 21dfea39..de04d242 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -129,6 +129,7 @@ if ($OSVersion -eq "Windows 10 Enterprise") { if (Is64BitWinHost) { DownloadAndInstallSquish $version win64 "msvc14" + DownloadAndInstallSquish $version win64 "msvc141" DownloadAndInstallSquish $version win64 "mingw_gcc73_posix_seh" } else { DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf" @@ -146,6 +147,8 @@ if ($OSVersion -eq "Windows 10 Enterprise") { if (Is64BitWinHost) { DownloadAndInstallSquish $version win64 "msvc14" + } else { + DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf" } DownloadAndInstallSquish $version win32 "msvc141" } -- cgit v1.2.3