oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-09-05 18:41:05 +00:00
Code Wiki Activity

Bump CI runners windows-2019 to windows-2025

Browse source
This commit is contained in:
AFCMS 2025-08-10 17:44:04 +02:00 • committed by GitHub
parent 7a99fdf490
commit bbade5d3bc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
.github/workflows/windows.yml vendored
View file

@ -68,8 +68,8 @@ jobs:
if-no-files-found: error if-no-files-found: error
msvc: msvc:
name: VS 2019 ${{ matrix.config.arch }}-${{ matrix.type }} name: VS 2022 ${{ matrix.config.arch }}-${{ matrix.type }}
runs-on: windows-2019 runs-on: windows-2025
env: env:
VCPKG_DEFAULT_TRIPLET: ${{matrix.config.vcpkg_triplet}} VCPKG_DEFAULT_TRIPLET: ${{matrix.config.vcpkg_triplet}}
strategy: strategy:
@ -78,12 +78,12 @@ jobs:
config: config:
- { - {
arch: x86, arch: x86,
generator: "-G'Visual Studio 16 2019' -A Win32", generator: "-G'Visual Studio 17 2022' -A Win32",
vcpkg_triplet: x86-windows vcpkg_triplet: x86-windows
} }
- { - {
arch: x64, arch: x64,
generator: "-G'Visual Studio 16 2019' -A x64", generator: "-G'Visual Studio 17 2022' -A x64",
vcpkg_triplet: x64-windows vcpkg_triplet: x64-windows
} }
type: [portable] type: [portable]

4
doc/compiling/windows.md
View file

@ -14,10 +14,10 @@ It is highly recommended to use vcpkg as package manager.
After you successfully built vcpkg you can easily install the required libraries: After you successfully built vcpkg you can easily install the required libraries:
```powershell ```powershell
vcpkg install zlib zstd curl[winssl] openal-soft libvorbis libogg libjpeg-turbo sqlite3 freetype luajit gmp jsoncpp gettext[tools] sdl2 --triplet x64-windows vcpkg install zlib zstd curl[ssl] openal-soft libvorbis libogg libjpeg-turbo sqlite3 freetype luajit gmp jsoncpp gettext[tools] sdl2 --triplet x64-windows
``` ```
- `curl` is optional, but required to read the serverlist, `curl[winssl]` is required to use the content store. - `curl` is optional, but required to read the serverlist, `curl[ssl]` is required to use the content store.
- `openal-soft`, `libvorbis` and `libogg` are optional, but required to use sound. - `openal-soft`, `libvorbis` and `libogg` are optional, but required to use sound.
- `luajit` is optional, it replaces the integrated Lua interpreter with a faster just-in-time interpreter. - `luajit` is optional, it replaces the integrated Lua interpreter with a faster just-in-time interpreter.
- `gmp` and `jsoncpp` are optional, otherwise the bundled versions will be compiled - `gmp` and `jsoncpp` are optional, otherwise the bundled versions will be compiled

3
vcpkg.json
View file

@ -3,10 +3,11 @@
"dependencies": [ "dependencies": [
"zlib", "zlib",
"zstd", "zstd",
"openssl",
{ {
"name": "curl", "name": "curl",
"features": [ "features": [
"winssl" "ssl"
] ]
}, },
"openal-soft", "openal-soft",