Skip to content

Commit

Permalink
chore: build with vs2022
Browse files Browse the repository at this point in the history
  • Loading branch information
Julusian authored May 15, 2024
1 parent aab6b32 commit 23be0e3
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

jobs:
build:
runs-on: windows-2019
runs-on: windows-2022

steps:
- uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions BUILDING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/).

Expand All @@ -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`

Expand Down
6 changes: 3 additions & 3 deletions tools/windows/build.bat
Original file line number Diff line number Diff line change
@@ -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...
Expand All @@ -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...
Expand Down

0 comments on commit 23be0e3

Please sign in to comment.