From 23be0e34dd935cb88427741439e9076d3842d90c Mon Sep 17 00:00:00 2001 From: Julian Waller Date: Wed, 15 May 2024 12:56:13 +0100 Subject: [PATCH] chore: build with vs2022 --- .github/workflows/windows.yml | 2 +- BUILDING.md | 4 ++-- tools/windows/build.bat | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 19d52c9e57..0748a5ac8b 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -8,7 +8,7 @@ on: jobs: build: - runs-on: windows-2019 + runs-on: windows-2022 steps: - uses: actions/checkout@v4 diff --git a/BUILDING.md b/BUILDING.md index dfcf624d72..d8b4532bc6 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -22,7 +22,7 @@ You can figure out which files you need by looking at each of the `ExternalProje ## Development using Visual Studio -1. Install Visual Studio 2019. +1. Install Visual Studio 2022. 2. Install CMake (http://www.cmake.org/download/). @@ -34,7 +34,7 @@ You can figure out which files you need by looking at each of the `ExternalProje 6. `cd build` -7. `cmake -G "Visual Studio 16 2019" -A x64 ../src` +7. `cmake -G "Visual Studio 17 2022" -A x64 ../src` 8. Open `CasparCG Server.sln` diff --git a/tools/windows/build.bat b/tools/windows/build.bat index 8151e9c137..2595b1d453 100644 --- a/tools/windows/build.bat +++ b/tools/windows/build.bat @@ -1,11 +1,11 @@ @echo off set BUILD_ARCHIVE_NAME=casparcg_server -set BUILD_VCVARSALL=C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat +set BUILD_VCVARSALL=C:\Program Files (x86)\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat set BUILD_7ZIP=C:\Program Files\7-Zip\7z.exe @REM Github Actions has Enterprise available -if DEFINED CI set BUILD_VCVARSALL=C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat +if DEFINED CI set BUILD_VCVARSALL=C:\Program Files (x86)\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat :: Clean and enter shadow build folder echo Cleaning... @@ -18,7 +18,7 @@ call "%BUILD_VCVARSALL%" amd64 || goto :error :: Run cmake cd dist || goto :error -cmake -G "Visual Studio 16 2019" -A x64 ..\src || goto :error +cmake -G "Visual Studio 17 2022" -A x64 ..\src || goto :error :: Build with MSBuild echo Building...