Skip to content

Commit 254b1da

Browse files
build(shell): add yalantinglibs
1 parent 6c571aa commit 254b1da

File tree

3 files changed

+54
-177
lines changed

3 files changed

+54
-177
lines changed

dependencies/reflect-cpp.lua

Lines changed: 0 additions & 167 deletions
This file was deleted.

xmake-requires.lock

Lines changed: 37 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,36 @@
33
version = "1.0"
44
},
55
["windows|x64"] = {
6+
["asio#31fecfc4"] = {
7+
repo = {
8+
branch = "master",
9+
commit = "dd0994a8a573ee729ea1fcd8412ab8f929a25b9b",
10+
url = "https://github.com/xmake-io/xmake-repo.git"
11+
},
12+
version = "1.34.2"
13+
},
14+
["async_simple#4d66dd9c"] = {
15+
repo = {
16+
branch = "master",
17+
commit = "dd0994a8a573ee729ea1fcd8412ab8f929a25b9b",
18+
url = "https://github.com/xmake-io/xmake-repo.git"
19+
},
20+
version = "18f3882b"
21+
},
622
["blook#31fecfc4"] = {
723
version = "latest"
824
},
925
["breeze-glfw#31fecfc4"] = {
1026
version = "latest"
1127
},
28+
["cinatra#31fecfc4"] = {
29+
repo = {
30+
branch = "master",
31+
commit = "dd0994a8a573ee729ea1fcd8412ab8f929a25b9b",
32+
url = "https://github.com/xmake-io/xmake-repo.git"
33+
},
34+
version = "e329293f"
35+
},
1236
["cmake#31fecfc4"] = {
1337
repo = {
1438
branch = "master",
@@ -25,13 +49,13 @@
2549
},
2650
version = "v0.8.3"
2751
},
28-
["ctre#5a639230"] = {
52+
["frozen#31fecfc4"] = {
2953
repo = {
3054
branch = "master",
31-
commit = "e1b9ad14ffc4855386077641d9c4b87a136c6edc",
55+
commit = "dd0994a8a573ee729ea1fcd8412ab8f929a25b9b",
3256
url = "https://github.com/xmake-io/xmake-repo.git"
3357
},
34-
version = "v3.9.0"
58+
version = "1.2.0"
3559
},
3660
["glad#31fecfc4"] = {
3761
repo = {
@@ -41,6 +65,14 @@
4165
},
4266
version = "v0.1.36"
4367
},
68+
["iguana#31fecfc4"] = {
69+
repo = {
70+
branch = "master",
71+
commit = "dd0994a8a573ee729ea1fcd8412ab8f929a25b9b",
72+
url = "https://github.com/xmake-io/xmake-repo.git"
73+
},
74+
version = "1.0.8"
75+
},
4476
["nanosvg#31fecfc4"] = {
4577
repo = {
4678
branch = "master",
@@ -84,9 +116,6 @@
84116
["quickjs-ng#31fecfc4"] = {
85117
version = "v0.8.0"
86118
},
87-
["reflect-cpp#31fecfc4"] = {
88-
version = "v0.17.0"
89-
},
90119
["wintoast#31fecfc4"] = {
91120
repo = {
92121
branch = "master",
@@ -95,13 +124,13 @@
95124
},
96125
version = "v1.3.1"
97126
},
98-
["yyjson#31fecfc4"] = {
127+
["yalantinglibs b82a21925958b6c50deba3aa26a2737cdb814e27#31fecfc4"] = {
99128
repo = {
100129
branch = "master",
101130
commit = "dd0994a8a573ee729ea1fcd8412ab8f929a25b9b",
102131
url = "https://github.com/xmake-io/xmake-repo.git"
103132
},
104-
version = "0.11.1"
133+
version = "b82a2192"
105134
}
106135
}
107136
}

xmake.lua

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,28 @@ add_rules("mode.releasedbg")
1010

1111
includes("dependencies/blook.lua")
1212
includes("dependencies/glfw.lua")
13-
includes("dependencies/reflect-cpp.lua")
1413
includes("dependencies/quickjs-ng.lua")
1514

1615
set_runtimes("MT")
1716
add_requires("breeze-glfw", {alias = "glfw"})
1817
add_requires("blook", "nanovg", "glad", "quickjs-ng", "nanosvg", "reflect-cpp", "wintoast", "cpptrace v0.8.3")
1918

19+
add_requires("yalantinglibs b82a21925958b6c50deba3aa26a2737cdb814e27", {
20+
configs = {
21+
ssl = true
22+
}
23+
})
24+
25+
add_requireconfs("**.cinatra", {
26+
override = true,
27+
version = "e329293f6705649a6f1e8847ec845a7631179bb8"
28+
})
29+
30+
add_requireconfs("**.async_simple", {
31+
override = true,
32+
version = "18f3882be354d407af0f0674121dcddaeff36e26"
33+
})
34+
2035
target("ui")
2136
set_kind("static")
2237
add_packages("glfw", "glad", "nanovg", "nanosvg", {
@@ -40,7 +55,7 @@ target("ui_test")
4055

4156
target("shell")
4257
set_kind("shared")
43-
add_packages("blook", "quickjs-ng", "reflect-cpp", "wintoast", "cpptrace")
58+
add_packages("blook", "quickjs-ng", "reflect-cpp", "wintoast", "cpptrace", "yalantinglibs")
4459
add_deps("ui")
4560
add_syslinks("oleacc", "ole32", "oleaut32", "uuid", "comctl32", "comdlg32", "gdi32", "user32", "shell32", "kernel32", "advapi32", "psapi", "Winhttp", "dbghelp")
4661
add_rules("utils.bin2c", {

0 commit comments

Comments
 (0)