win-scons CI use windows-2022

This commit is contained in:
2025-07-01 09:56:58 -05:00
committed by Celtic Minstrel
parent e4de1672ab
commit 6b98992920
3 changed files with 4 additions and 4 deletions

View File

@@ -125,7 +125,7 @@
]
},
win-scons: {
runs-on: windows-2019,
runs-on: windows-2022,
env: {
VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
},
@@ -164,7 +164,7 @@
]
},
# win-mingw: {
# runs-on: windows-2019,
# runs-on: windows-2022,
# steps: [
# {
# name: checkout,

View File

@@ -10,6 +10,6 @@ REM @echo "%%i"
REM call "%%i" x86_amd64
REM )
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64
scons bits=64 %*

View File

@@ -379,7 +379,7 @@ if not env.GetOption('clean'):
Exit(1)
boost_versions = ['-1_84'] # This is a bit of a hack. :(
suffixes = ['-mt', f'-mt-x{env["bits"]}']
suffixes = ['-mt', f'-mt-x{env["bits"]}', f'-vc143-mt-x{env["bits"]}', f'-vc144-mt-x{env["bits"]}']
zlib = 'zlib' if (platform == "win32" and 'mingw' not in env["TOOLS"]) else 'z'
check_lib(zlib, 'zlib', ['d'], [])