diff options
| author | Egor Tensin <Egor.Tensin@gmail.com> | 2019-12-09 06:59:32 +0300 |
|---|---|---|
| committer | Egor Tensin <Egor.Tensin@gmail.com> | 2019-12-09 07:40:04 +0300 |
| commit | cbdb2312a4192d55369b58eef23c13fffc7f177a (patch) | |
| tree | 14fc22b764af874baeba0e69edd3fca1f3eb7c15 /.appveyor | |
| parent | update cmake-common (diff) | |
| download | aes-tools-cbdb2312a4192d55369b58eef23c13fffc7f177a.tar.gz aes-tools-cbdb2312a4192d55369b58eef23c13fffc7f177a.zip | |
AppVeyor: build w/ VS 2019
Diffstat (limited to '')
| -rw-r--r-- | .appveyor/build.ps1 | 27 |
1 files changed, 3 insertions, 24 deletions
diff --git a/.appveyor/build.ps1 b/.appveyor/build.ps1 index 1ebad9a..208fab8 100644 --- a/.appveyor/build.ps1 +++ b/.appveyor/build.ps1 @@ -35,28 +35,6 @@ function Test-AppVeyor { return Test-Path env:APPVEYOR } -function Format-AppVeyorBoostDir { - return "boost_" + $env:appveyor_boost_version.replace('.', '_') -} - -function Get-AppVeyorBoostDir { - return "C:\Libraries\$(Format-AppVeyorBoostDir)" -} - -function Get-AppVeyorBoostLibraryDir { - param( - [string] $Platform = $env:PLATFORM - ) - - $BoostDir = Get-AppVeyorBoostDir - - if ($Platform -eq 'x64') { - return "$BoostDir\lib64-msvc-14.1" - } else { - return "$BoostDir\lib32-msvc-14.1" - } -} - function Set-AppVeyorDefaults { $script:ProjectDir = $env:APPVEYOR_BUILD_FOLDER $script:BuildDir = 'C:\Projects\build' @@ -64,12 +42,13 @@ function Set-AppVeyorDefaults { 'Visual Studio 2013' { 'Visual Studio 12 2013' } 'Visual Studio 2015' { 'Visual Studio 14 2015' } 'Visual Studio 2017' { 'Visual Studio 15 2017' } + 'Visual Studio 2019' { 'Visual Studio 16 2019' } default { throw "Unsupported AppVeyor image: $env:APPVEYOR_BUILD_WORKER_IMAGE" } } $script:Platform = $env:PLATFORM $script:Configuration = $env:CONFIGURATION - $script:BoostDir = Get-AppVeyorBoostDir - $script:BoostLibraryDir = Get-AppVeyorBoostLibraryDir -Platform $script:Platform + $script:BoostDir = $env:appveyor_boost_root + $script:BoostLibraryDir = $env:appveyor_boost_librarydir $script:UseAsm = -not ($env:appveyor_asm -eq '0') } |