Skip to content

Commit 8083ebc

Browse files
committed
update vcpkg baseline
1 parent 2d68ae6 commit 8083ebc

File tree

3 files changed

+95
-33
lines changed

3 files changed

+95
-33
lines changed

.github/workflows/build-client-vcpkg.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
run: |
8080
sudo apt update
8181
sudo apt install -y --no-install-recommends \
82-
autoconf autoconf-archive automake libtool nasm
82+
autoconf autoconf-archive automake libtool nasm libltdl-dev
8383
8484
- id: vcpkg-cache
8585
uses: actions/cache/restore@v4

vcpkg-configuration.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,9 @@
22
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg-configuration.schema.json",
33
"default-registry": {
44
"kind": "git",
5-
"baseline": "890e0f0506f9dcb76800dfa2ea28b03ebc627bfa",
5+
"baseline": "0a434205c521ca43d66921271ae2a1d051e718a5",
66
"repository": "https://github.com/microsoft/vcpkg"
77
},
8-
"overlay-ports": [
9-
"vcpkg-ports"
10-
],
118
"registries": [
129
{
1310
"kind": "artifact",
@@ -19,5 +16,8 @@
1916
"location": "https://artifacts.tools.arm.com/vcpkg-registry",
2017
"name": "arm"
2118
}
19+
],
20+
"overlay-ports": [
21+
"vcpkg-ports"
2222
]
2323
}

vcpkg.json

Lines changed: 90 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -13,75 +13,125 @@
1313
],
1414
"features": {
1515
"nel": {
16-
"description": "Builds NeL", "dependencies": [{
17-
"name": "ryzom-core",
18-
"default-features": false,
19-
"features": ["nel-3d", "nel-gui", "nel-net", "nel-web", "testing"]
20-
}]
16+
"description": "Builds NeL",
17+
"dependencies": [
18+
{
19+
"name": "ryzom-core",
20+
"default-features": false,
21+
"features": [
22+
"nel-3d",
23+
"nel-gui",
24+
"nel-net",
25+
"nel-web",
26+
"testing"
27+
]
28+
}
29+
]
2130
},
2231
"nel-3d": {
23-
"description": "Builds with 3D support", "dependencies": [
32+
"description": "Builds with 3D support",
33+
"dependencies": [
2434
{
2535
"name": "ryzom-core",
2636
"default-features": false,
27-
"features": ["nel-misc"]
37+
"features": [
38+
"nel-misc"
39+
]
2840
},
2941
{
3042
"name": "freetype",
3143
"default-features": false,
32-
"features": ["error-strings"]
44+
"features": [
45+
"error-strings"
46+
]
3347
}
3448
]
3549
},
3650
"nel-gui": {
37-
"description": "Builds with GUI support", "dependencies": ["lua","luabind","qt5"]
51+
"description": "Builds with GUI support",
52+
"dependencies": [
53+
"lua",
54+
"luabind",
55+
"qt5"
56+
]
3857
},
3958
"nel-misc": {
4059
"description": [],
4160
"dependencies": [
4261
"libpng",
4362
"libjpeg-turbo",
44-
{ "name":"libxml2", "default-features": false, "features": ["zlib"] },
63+
{
64+
"name": "libxml2",
65+
"default-features": false,
66+
"features": [
67+
"zlib"
68+
]
69+
},
4570
"zlib"
4671
]
4772
},
4873
"nel-net": {
49-
"description": "Builds with NET support", "dependencies": []
74+
"description": "Builds with NET support",
75+
"dependencies": []
5076
},
5177
"nel-web": {
52-
"description": "Builds with WEB support", "dependencies": [
78+
"description": "Builds with WEB support",
79+
"dependencies": [
5380
{
5481
"name": "ryzom-core",
5582
"default-features": false,
56-
"features": ["nel-misc"]
83+
"features": [
84+
"nel-misc"
85+
]
5786
},
5887
"curl",
59-
{ "name":"libxml2", "default-features": false, "features": ["zlib"] },
88+
{
89+
"name": "libxml2",
90+
"default-features": false,
91+
"features": [
92+
"zlib"
93+
]
94+
},
6095
"openssl"
6196
]
6297
},
6398
"nelns": {
64-
"description": "Builds NeL Network Services", "dependencies": [
99+
"description": "Builds NeL Network Services",
100+
"dependencies": [
65101
{
66102
"name": "ryzom-core",
67103
"default-features": false,
68-
"features": ["nel-misc", "nel-net"]
104+
"features": [
105+
"nel-misc",
106+
"nel-net"
107+
]
69108
}
70109
]
71110
},
72111
"ryzom": {
73-
"description": "Builds Ryzom", "dependencies": [{
74-
"name": "ryzom-core",
75-
"default-features": false,
76-
"features": ["ryzom-client", "ryzom-server", "ryzom-tools"]
77-
}]
112+
"description": "Builds Ryzom",
113+
"dependencies": [
114+
{
115+
"name": "ryzom-core",
116+
"default-features": false,
117+
"features": [
118+
"ryzom-client",
119+
"ryzom-server",
120+
"ryzom-tools"
121+
]
122+
}
123+
]
78124
},
79125
"ryzom-client": {
80-
"description": "Builds Ryzom Client", "dependencies": [
126+
"description": "Builds Ryzom Client",
127+
"dependencies": [
81128
{
82129
"name": "ryzom-core",
83130
"default-features": false,
84-
"features": ["nel-3d","nel-misc"]
131+
"features": [
132+
"nel-3d",
133+
"nel-misc"
134+
]
85135
},
86136
"curl",
87137
"luabind",
@@ -90,19 +140,31 @@
90140
]
91141
},
92142
"ryzom-server": {
93-
"description": "Builds Ryzom Services", "dependencies": []
143+
"description": "Builds Ryzom Services",
144+
"dependencies": []
94145
},
95146
"ryzom-tools": {
96-
"description": "Builds Ryzom Tools", "dependencies": []
147+
"description": "Builds Ryzom Tools",
148+
"dependencies": []
97149
},
98150
"ffmpeg": {
99-
"description": "Builds with ffmpeg support", "dependencies": ["ffmpeg"]
151+
"description": "Builds with ffmpeg support",
152+
"dependencies": [
153+
"ffmpeg"
154+
]
100155
},
101156
"msquic": {
102-
"description": "Builds with msquic", "dependencies": ["msquic"]
157+
"description": "Builds with msquic",
158+
"dependencies": [
159+
"msquic"
160+
]
103161
},
104162
"testing": {
105-
"description": "Builds tests", "dependencies": ["cpptest", "gtest"]
163+
"description": "Builds tests",
164+
"dependencies": [
165+
"cpptest",
166+
"gtest"
167+
]
106168
}
107169
}
108170
}

0 commit comments

Comments
 (0)