From cbdb2312a4192d55369b58eef23c13fffc7f177a Mon Sep 17 00:00:00 2001
From: Egor Tensin <Egor.Tensin@gmail.com>
Date: Mon, 9 Dec 2019 06:59:32 +0300
Subject: AppVeyor: build w/ VS 2019

---
 .appveyor/build.ps1 | 27 +++------------------------
 appveyor.yml        | 38 +++++++++++++++++++++++++++++++++++---
 2 files changed, 38 insertions(+), 27 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')
 }
 
diff --git a/appveyor.yml b/appveyor.yml
index b639dec..dc5ef86 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -3,6 +3,7 @@ version: '{build}'
 image:
   - Visual Studio 2015
   - Visual Studio 2017
+  - Visual Studio 2019
 
 environment:
   matrix:
@@ -35,11 +36,42 @@ for:
 - matrix:
     only:
       - image: Visual Studio 2015
+        platform: Win32
   environment:
-    appveyor_boost_version: 1.62.0
-
+    appveyor_boost_root: C:\Libraries\boost_1_62_0
+    appveyor_boost_librarydir: C:\Libraries\boost_1_62_0\lib32-msvc-14.0
+- matrix:
+    only:
+      - image: Visual Studio 2015
+        platform: x64
+  environment:
+    appveyor_boost_root: C:\Libraries\boost_1_62_0
+    appveyor_boost_librarydir: C:\Libraries\boost_1_62_0\lib64-msvc-14.0
 - matrix:
     only:
       - image: Visual Studio 2017
+        platform: Win32
+  environment:
+    appveyor_boost_root: C:\Libraries\boost_1_69_0
+    appveyor_boost_librarydir: C:\Libraries\boost_1_69_0\lib32-msvc-14.1
+- matrix:
+    only:
+      - image: Visual Studio 2017
+        platform: x64
+  environment:
+    appveyor_boost_root: C:\Libraries\boost_1_69_0
+    appveyor_boost_librarydir: C:\Libraries\boost_1_69_0\lib64-msvc-14.1
+- matrix:
+    only:
+      - image: Visual Studio 2019
+        platform: Win32
+  environment:
+    appveyor_boost_root: C:\Libraries\boost_1_71_0
+    appveyor_boost_librarydir: C:\Libraries\boost_1_71_0\lib32-msvc-14.2
+- matrix:
+    only:
+      - image: Visual Studio 2019
+        platform: x64
   environment:
-    appveyor_boost_version: 1.69.0
+    appveyor_boost_root: C:\Libraries\boost_1_71_0
+    appveyor_boost_librarydir: C:\Libraries\boost_1_71_0\lib64-msvc-14.2
-- 
cgit v1.2.3