Upgrade to VS2019, Qt 5.12.4

r52 · Aug 12, 2019 · ba78bdb · ba78bdb
1 parent d0a0bff
commit ba78bdb
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 20 deletions.
diff --git a/Quasar.vcxproj b/Quasar.vcxproj
@@ -13,17 +13,17 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{B12702AD-ABFB-343A-A199-8E24837244A3}</ProjectGuid>
     <Keyword>Qt4VSv1.0</Keyword>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

diff --git a/deploy/wincreateinstall.ps1 b/deploy/wincreateinstall.ps1
@@ -4,19 +4,19 @@ param (
     [switch]$clean = $false
 )
 
-pushd "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools"
+pushd "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\Tools"
 cmd /c "VsDevCmd.bat&set" |
 foreach {
   if ($_ -match "=") {
     $v = $_.split("="); set-item -force -path "ENV:\$($v[0])"  -value "$($v[1])"
   }
 }
 popd
-Write-Host "`nVisual Studio 2017 Command Prompt variables set." -ForegroundColor Yellow
+Write-Host "`nVisual Studio 2019 Command Prompt variables set." -ForegroundColor Yellow
 
 $qtpath = $env:QTDIR
 if ($null -eq $qtpath) {
-    $qtpath = "C:\Qt\5.12.3\msvc2017_64"
+    $qtpath = "C:\Qt\5.12.4\msvc2017_64"
 }
 
 $ifwpath = $env:QTIFW
@@ -47,8 +47,8 @@ $release_path = ".\build\x64\Release\"
 
 $release_files = ("Quasar.exe"),
 ("extension-api.dll"),
-("ssleay32.dll"),
-("libeay32.dll"),
+("libcrypto-1_1-x64.dll"),
+("libssl-1_1-x64.dll"),
 ("extensions\win_simple_perf.dll"),
 ("extensions\win_audio_viz.dll")
 
@@ -101,8 +101,8 @@ Copy-Item .\widgets\ -Destination ($package_paths[$widget_path] + "widgets\") -r
 
 # Copy SSL lib
 if (($env:OPENSSL) -and (Test-Path $env:OPENSSL -pathType container)) {
-    Copy-Item $env:OPENSSL\libeay32.dll -Destination $package_paths[$data_path] -Force
-    Copy-Item $env:OPENSSL\ssleay32.dll -Destination $package_paths[$data_path] -Force
+    Copy-Item $env:OPENSSL\libcrypto-1_1-x64.dll -Destination $package_paths[$data_path] -Force
+    Copy-Item $env:OPENSSL\libssl-1_1-x64.dll -Destination $package_paths[$data_path] -Force
 }
 
 # Deploy Qt

diff --git a/deploy/windeployqt.ps1 b/deploy/windeployqt.ps1
@@ -15,7 +15,7 @@ if ($debug)
 
 if ($null -eq $qtpath)
 {
-    $qtpath = "C:\Qt\5.12.3\msvc2017_64"
+    $qtpath = "C:\Qt\5.12.4\msvc2017_64"
 }
 
 $windeploy = "$($qtpath)\bin\windeployqt.exe"

diff --git a/extension-api/extension-api.vcxproj b/extension-api/extension-api.vcxproj
@@ -13,18 +13,18 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{DFCEC467-6147-4DF6-98FF-BD7AE8E17E52}</ProjectGuid>
     <Keyword>Qt4VSv1.0</Keyword>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
     <ProjectName>extension-api</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

diff --git a/extensions/win_audio_viz/win_audio_viz.vcxproj b/extensions/win_audio_viz/win_audio_viz.vcxproj
@@ -23,7 +23,7 @@
     <ProjectGuid>{6775782B-1D7A-46EA-A741-C8032936CA1E}</ProjectGuid>
     <RootNamespace>win_audio_viz</RootNamespace>
     <ProjectName>win_audio_viz</ProjectName>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -42,13 +42,13 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

diff --git a/extensions/win_simple_perf/win_simple_perf.vcxproj b/extensions/win_simple_perf/win_simple_perf.vcxproj
@@ -14,20 +14,20 @@
     <ProjectGuid>{0AA860FA-E76C-4AD9-B473-D564D8C73327}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>win_cpu_test</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
     <ProjectName>win_simple_perf</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>