Skip to content

Commit 4b2e6c7

Browse files
tsunamistatetsunamistate
authored
Update VCPKG baseline commit
1 parent 2c1a364 commit 4b2e6c7

2 files changed

Lines changed: 56 additions & 49 deletions

File tree

‎.github/workflows/Windows_MSVC_x64.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
- name: Restore or setup vcpkg
4343
uses: lukka/run-vcpkg@v11.6
4444
with:
45-
vcpkgGitCommitId: 'a62ce77d56ee07513b4b67de1ec2daeaebfae51a'
45+
vcpkgGitCommitId: '40f3c709db80acf154ac4b17a1f83c564ebd022e'
4646

4747
- name: Fetch test data
4848
run: |

‎vcpkg.json‎

Lines changed: 55 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,57 @@
11
{
2-
"name": "devilutionx",
3-
"version-string": "1.6.0",
4-
"dependencies": [
5-
"bzip2",
6-
"lua",
7-
"magic-enum"
8-
],
9-
"builtin-baseline": "a62ce77d56ee07513b4b67de1ec2daeaebfae51a",
10-
"features": {
11-
"sdl1": {
12-
"description": "Use SDL1.2 instead of SDL2",
13-
"dependencies": [
14-
"sdl1",
15-
"libpng"
16-
]
17-
},
18-
"sdl2": {
19-
"description": "Use SDL2",
20-
"dependencies": [
21-
"sdl2",
22-
"sdl2-image"
23-
]
24-
},
25-
"encryption": {
26-
"description": "Build libsodium for packet encryption",
27-
"dependencies": [
28-
"libsodium"
29-
]
30-
},
31-
"translations": {
32-
"description": "Build translation files",
33-
"dependencies": [
34-
{
35-
"name": "gettext",
36-
"features": [
37-
"tools"
38-
]
39-
}
40-
]
41-
},
42-
"tests": {
43-
"description": "Build tests",
44-
"dependencies": [
45-
"gtest",
46-
"benchmark"
47-
]
48-
}
49-
}
2+
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
3+
"name": "devilutionx",
4+
"version-string": "1.6.0",
5+
"dependencies": [
6+
"bzip2",
7+
"lua",
8+
"magic-enum"
9+
],
10+
"builtin-baseline": "40f3c709db80acf154ac4b17a1f83c564ebd022e",
11+
"overrides": [
12+
{
13+
"name": "lua",
14+
"version": "5.4.6"
15+
}
16+
],
17+
"features": {
18+
"sdl1": {
19+
"description": "Use SDL1.2 instead of SDL2",
20+
"dependencies": [
21+
"sdl1",
22+
"libpng"
23+
]
24+
},
25+
"sdl2": {
26+
"description": "Use SDL2",
27+
"dependencies": [
28+
"sdl2",
29+
"sdl2-image"
30+
]
31+
},
32+
"encryption": {
33+
"description": "Build libsodium for packet encryption",
34+
"dependencies": [
35+
"libsodium"
36+
]
37+
},
38+
"translations": {
39+
"description": "Build translation files",
40+
"dependencies": [
41+
{
42+
"name": "gettext",
43+
"features": [
44+
"tools"
45+
]
46+
}
47+
]
48+
},
49+
"tests": {
50+
"description": "Build tests",
51+
"dependencies": [
52+
"gtest",
53+
"benchmark"
54+
]
55+
}
56+
}
5057
}

0 commit comments

Comments
 (0)