# HG changeset patch # User Chris Cannam # Date 1571764432 -3600 # Node ID 812181ef834ba0c6ce67794ec4d52038e942de07 # Parent b80deac5ada8263b2586473d6d8cafef677e8bc4 Update to VS2019 diff -r b80deac5ada8 -r 812181ef834b .appveyor.yml --- a/.appveyor.yml Tue Oct 22 17:12:44 2019 +0100 +++ b/.appveyor.yml Tue Oct 22 18:13:52 2019 +0100 @@ -1,6 +1,6 @@ image: - - Visual Studio 2017 + - Visual Studio 2019 configuration: - Release diff -r b80deac5ada8 -r 812181ef834b deploy/win64/build-64.bat --- a/deploy/win64/build-64.bat Tue Oct 22 17:12:44 2019 +0100 +++ b/deploy/win64/build-64.bat Tue Oct 22 18:13:52 2019 +0100 @@ -9,12 +9,14 @@ @ exit /b 2 ) -if not exist "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" ( +set vcvarsall="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" + +if not exist %vcvarsall% ( @ echo "Could not find MSVC vars batch file" @ exit /b 2 ) -call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64 +call %vcvarsall% amd64 set ORIGINALPATH=%PATH% set PATH=%PATH%;C:\Program Files (x86)\SMLNJ\bin;%QTDIR%\bin diff -r b80deac5ada8 -r 812181ef834b deploy/win64/tony.wxs --- a/deploy/win64/tony.wxs Tue Oct 22 17:12:44 2019 +0100 +++ b/deploy/win64/tony.wxs Tue Oct 22 18:13:52 2019 +0100 @@ -194,20 +194,20 @@ + Source="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.22.27821\x64\Microsoft.VC142.CRT\msvcp140.DLL"/> + Source="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.22.27821\x64\Microsoft.VC142.CRT\vccorlib140.DLL"/> + Source="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.22.27821\x64\Microsoft.VC142.CRT\vcruntime140.DLL"/>