Mercurial > hg > sonic-visualiser

changeset 2397:1a4bd4aa40ec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update to VC2019
author Chris Cannam
date Wed, 23 Oct 2019 09:10:47 +0100
parents ab09e05b0d35
children c956435cb3e8
files .appveyor.yml deploy/win64/build-64.bat deploy/win64/sonic-visualiser.wxs
diffstat 3 files changed, 24 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/.appveyor.yml	Tue Oct 22 17:13:50 2019 +0100
+++ b/.appveyor.yml	Wed Oct 23 09:10:47 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:13:50 2019 +0100
+++ b/deploy/win64/build-64.bat	Wed Oct 23 09:10:47 2019 +0100
@@ -5,18 +5,20 @@
 
 set STARTPWD=%CD%
 
-set QTDIR=C:\Qt\5.13.0\msvc2017_64
+set QTDIR=C:\Qt\5.13.1\msvc2017_64
 if not exist %QTDIR% (
-@   echo Could not find 64-bit Qt
+@   echo Could not find 64-bit Qt in %QTDIR%
 @   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=C:\Program Files (x86)\SMLNJ\bin;%QTDIR%\bin;%PATH%
--- a/deploy/win64/sonic-visualiser.wxs	Tue Oct 22 17:13:50 2019 +0100
+++ b/deploy/win64/sonic-visualiser.wxs	Wed Oct 23 09:10:47 2019 +0100
@@ -170,23 +170,23 @@
                  installers and get installed by default to C:\Program
                  Files (x86)\Windows Kits\... -->
                
-               <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"
-                   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"/>
-               <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"/>
-               <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"/>
+            <File
+                Id="concrt140"
+                Name="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\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\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\2019\Community\VC\Redist\MSVC\14.22.27821\x64\Microsoft.VC142.CRT\vcruntime140.DLL"/>
           </Component>
 
 	  <Directory Id="Platforms" Name="platforms">