Mercurial > hg > tony

changeset 649:812181ef834b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update to VS2019
author Chris Cannam
date Tue, 22 Oct 2019 18:13:52 +0100
parents b80deac5ada8
children 83cda426a045
files .appveyor.yml deploy/win64/build-64.bat deploy/win64/tony.wxs
diffstat 3 files changed, 9 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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
--- 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 @@
                <File
                    Id="concrt140"
                    Name="concrt140.dll"
-                   Source="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.CRT\concrt140.DLL"
+                   Source="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.22.27821\x64\Microsoft.VC142.CRT\concrt140.DLL"
                    KeyPath="yes"/>
                <File
                    Id="msvcp140"
                    Name="msvcp140.dll"
-                   Source="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.CRT\msvcp140.DLL"/>
+                   Source="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.22.27821\x64\Microsoft.VC142.CRT\msvcp140.DLL"/>
                <File
                    Id="vccorlib140"
                    Name="vccorlib140.dll"
-                   Source="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.CRT\vccorlib140.DLL"/>
+                   Source="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.22.27821\x64\Microsoft.VC142.CRT\vccorlib140.DLL"/>
                <File
                    Id="vcruntime140"
                    Name="vcruntime140.dll"
-                   Source="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\x64\Microsoft.VC141.CRT\vcruntime140.DLL"/>
+                   Source="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.22.27821\x64\Microsoft.VC142.CRT\vcruntime140.DLL"/>
           </Component>
 
 	  <Directory Id="Platforms" Name="platforms">