mirror of
https://github.com/CorsixTH/CorsixTH.git
synced 2025-07-23 12:23:05 +02:00
Bump vcpkg packages and remove SDL version lock
sdl2-mixer patch is fixed to closer match upstream which can fix compile failures in that port. Bump corsixth vcpkg repo again for sdl2-mixer fix
This commit is contained in:
2
.github/workflows/Windows.yml
vendored
2
.github/workflows/Windows.yml
vendored
@@ -50,7 +50,7 @@ jobs:
|
|||||||
- name: Setup vcpkg
|
- name: Setup vcpkg
|
||||||
uses: lukka/run-vcpkg@v11
|
uses: lukka/run-vcpkg@v11
|
||||||
with:
|
with:
|
||||||
vcpkgGitCommitId: 'a1212c93cabaa9c5c36c1ffdb4bddd59fdf31e43'
|
vcpkgGitCommitId: '5f4628b89f3f98cd9a0b43c27ded2aa53da1f790'
|
||||||
|
|
||||||
- name: Run CMake dev configure
|
- name: Run CMake dev configure
|
||||||
if: inputs.PRESET == 'win-dev'
|
if: inputs.PRESET == 'win-dev'
|
||||||
|
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"default-registry": {
|
"default-registry": {
|
||||||
"kind": "git",
|
"kind": "git",
|
||||||
"baseline": "a1212c93cabaa9c5c36c1ffdb4bddd59fdf31e43",
|
"baseline": "5f4628b89f3f98cd9a0b43c27ded2aa53da1f790",
|
||||||
"repository": "https://github.com/microsoft/vcpkg"
|
"repository": "https://github.com/microsoft/vcpkg"
|
||||||
},
|
},
|
||||||
"registries": [
|
"registries": [
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
{
|
{
|
||||||
"kind": "git",
|
"kind": "git",
|
||||||
"repository": "https://github.com/CorsixTH/vcpkg-registry",
|
"repository": "https://github.com/CorsixTH/vcpkg-registry",
|
||||||
"baseline": "30e94d20cb95de2cc64941c0ba6bd901890ccec6",
|
"baseline": "f8112bf320835623dd837725c85e29a11087135d",
|
||||||
"packages": [ "ffmpeg", "sdl2-mixer", "luafilesystem", "lpeg" ]
|
"packages": [ "ffmpeg", "sdl2-mixer", "luafilesystem", "lpeg" ]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
@@ -81,8 +81,5 @@
|
|||||||
"catch2"
|
"catch2"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
},
|
}
|
||||||
"overrides": [
|
|
||||||
{ "name": "sdl2", "version": "2.28.2" }
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user