Skip to content

Commit f2950f3

Browse files
committed
Merge branch 'feat/migrate-to-new-build-system' into develop
2 parents d06f844 + f618dab commit f2950f3

File tree

2 files changed

+24
-154
lines changed

2 files changed

+24
-154
lines changed

scripts/after_build.lua

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

xmake.lua

Lines changed: 24 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,21 @@ add_rules("mode.debug", "mode.release")
22

33
add_repositories("liteldev-repo https://github.com/LiteLDev/xmake-repo.git")
44

5+
if is_config("target_type", "server") then
6+
add_requires("levilamina develop", {configs = {target_type = "server"}})
7+
else
8+
add_requires("levilamina develop", {configs = {target_type = "client"}})
9+
end
10+
11+
add_requires("levibuildscript")
12+
513
add_requires(
614
"demangler",
715
"dyncall",
816
"fmt",
917
"legacymoney 0.8.3",
1018
"legacyparticleapi 0.8.3",
1119
"legacyremotecall 0.8.3",
12-
"levilamina 0.13.5",
1320
"lightwebsocketclient",
1421
"magic_enum",
1522
"nlohmann_json",
@@ -38,29 +45,25 @@ if not has_config("vs_runtime") then
3845
set_runtimes("MD")
3946
end
4047

48+
option("target_type")
49+
set_default("server")
50+
set_showmenu(true)
51+
set_values("server", "client")
52+
option_end()
53+
4154
option("backend")
4255
set_default("lua")
4356
set_values("lua", "quickjs", "python", "nodejs")
4457

4558
target("legacy-script-engine")
46-
add_cxflags(
47-
"/EHa",
48-
"/utf-8",
49-
"/sdl",
50-
"/W4"
51-
)
59+
add_rules("@levibuildscript/linkrule")
60+
add_rules("@levibuildscript/modpacker")
61+
add_cxflags("/EHa", "/utf-8", "/W4", "/w44265", "/w44289", "/w44296", "/w45263", "/w44738", "/w45204")
5262
add_defines(
5363
"NOMINMAX",
5464
"UNICODE",
5565
"_AMD64_"
5666
)
57-
add_files(
58-
"src/**.cpp"
59-
)
60-
add_includedirs(
61-
"src",
62-
"src/legacy"
63-
)
6467
add_packages(
6568
"cpp-httplib",
6669
"demangler",
@@ -78,9 +81,6 @@ target("legacy-script-engine")
7881
"sqlite3",
7982
"toml++"
8083
)
81-
add_shflags(
82-
"/DELAYLOAD:bedrock_server.dll"
83-
)
8484
set_exceptions("none")
8585
set_kind("shared")
8686
set_languages("cxx20")
@@ -112,14 +112,11 @@ target("legacy-script-engine")
112112

113113
end
114114

115-
after_build(function (target)
116-
local plugin_packer = import("scripts.after_build")
117-
118-
local plugin_define = {
119-
pluginName = target:basename(),
120-
pluginFile = path.filename(target:targetfile()),
121-
}
122-
123-
plugin_packer.pack_plugin(target,plugin_define)
124-
end)
115+
add_files(
116+
"src/**.cpp"
117+
)
118+
add_includedirs(
119+
"src",
120+
"src/legacy"
121+
)
125122

0 commit comments

Comments
 (0)