From 168acb5aaabbd19320c6c68c915a064ba4ad0a40 Mon Sep 17 00:00:00 2001 From: Peter L Jones Date: Thu, 26 Dec 2024 16:47:19 +0000 Subject: [PATCH] And bump Qt and MSVC in randomly located script --- COMPILING.md | 2 +- windows/deploy_windows.ps1 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/COMPILING.md b/COMPILING.md index 31eb6b4acd..eacc929cfc 100644 --- a/COMPILING.md +++ b/COMPILING.md @@ -78,7 +78,7 @@ Download and install Qt e.g via the [official open source installer](https://www **Note:** - Use the free GPLv2 license for Open Source development, not the commercial "universal installer" -- Select Components during installation: Expand the Qt section, find the matching version, preferrably **Qt 5.15.2**, and add the compiler components for your compiler, e.g., `MSVC 2019 32-bit/64-bit` for Visual Studio 2019 +- Select Components during installation: Expand the Qt section, find the matching version. To match the Github builds, you will need to check the versions in `windows/deploy_windows.ps2`. This gives both the Qt and MSVC versions (e.g. 6.8.1 and msvc2022_64 for a 64bit release). If you build with *JACK* support, install JACK via choco: `choco install --no-progress -y jack` diff --git a/windows/deploy_windows.ps1 b/windows/deploy_windows.ps1 index 54cbd13df5..004d9a25f4 100644 --- a/windows/deploy_windows.ps1 +++ b/windows/deploy_windows.ps1 @@ -1,9 +1,9 @@ param ( # Replace default path with system Qt installation folder if necessary [string] $QtInstallPath32 = "C:\Qt\5.15.2", - [string] $QtInstallPath64 = "C:\Qt\5.15.2", + [string] $QtInstallPath64 = "C:\Qt\6.8.1", [string] $QtCompile32 = "msvc2019", - [string] $QtCompile64 = "msvc2019_64", + [string] $QtCompile64 = "msvc2022_64", # Important: # - Do not update ASIO SDK without checking for license-related changes. # - Do not copy (parts of) the ASIO SDK into the Jamulus source tree without