@@ -18,6 +18,8 @@ environment:
1818 APPVEYOR_BUILD_WORKER_IMAGE : Visual Studio 2015
1919 - MSVC_VER : 15
2020 APPVEYOR_BUILD_WORKER_IMAGE : Visual Studio 2017
21+ - MSVC_VER : 16
22+ APPVEYOR_BUILD_WORKER_IMAGE : Visual Studio 2019
2123
2224install :
2325# Install GitLink
@@ -30,7 +32,9 @@ before_build:
3032
3133# Setup msvc environment for required compiler version (specified by MSVC_VER)
3234- ps : >-
33- if ($env:MSVC_VER -eq 15) {
35+ if ($env:MSVC_VER -eq 16) {
36+ $env:VCVARS="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat"
37+ } elseif ($env:MSVC_VER -eq 15) {
3438 $env:VCVARS="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat"
3539 } else {
3640 $env:VSCOMNTOOLS=(Get-Content ("env:VS" + "$env:MSVC_VER" + "0COMNTOOLS"))
@@ -100,18 +104,20 @@ before_build:
100104# Set Targets path so that gitlink works correctly
101105- ps : $env:MSBUILDDIR=((Get-Command msbuild.exe).Path | Split-Path -parent)
102106- ps : >-
103- if ($env:MSVC_VER -eq 15) {
107+ if ($env:MSVC_VER -eq 16) {
108+ $env:VCTargetsPath="$env:MSBUILDDIR\..\..\Microsoft\VC\v160\"
109+ } elseif ($env:MSVC_VER -eq 15) {
104110 $env:VCTargetsPath="$env:MSBUILDDIR\..\..\..\Common7\IDE\VC\VCTargets"
105111 } else {
106112 $env:VCTargetsPath="$env:MSBUILDDIR\..\..\..\Microsoft.Cpp\v4.0\V${env:MSVC_VER}0"
107113 }
108114
109115# Download and install yasm integration
110- - ps : (New-Object Net.WebClient).DownloadFile('https://github.com/ShiftMediaProject/VSYASM/releases/download/0.3 /VSYASM.zip', "$pwd\yasm.zip")
116+ - ps : (New-Object Net.WebClient).DownloadFile('https://github.com/ShiftMediaProject/VSYASM/releases/download/0.5 /VSYASM.zip', "$pwd\yasm.zip")
111117- ps : Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::ExtractToDirectory("$pwd\yasm.zip", "$pwd\TempYASMUnpack")
112118- cmd : call ".\TempYASMUnpack\install_script.bat"
113119# Additional yasm location in order to fix gitlink error
114- - ps : if ($env:MSVC_VER -ne 15) { Copy-Item -Force "TempYASMUnpack\*.*" "$env:VCTargetsPath\..\BuildCustomizations" }
120+ - ps : if ($env:MSVC_VER -lt 15) { Copy-Item -Force "TempYASMUnpack\*.*" "$env:VCTargetsPath\..\BuildCustomizations" }
115121
116122build :
117123 project : build.vcxproj
0 commit comments