diff options
| author | ruki <[email protected]> | 2025-01-09 10:19:14 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2025-01-09 10:19:14 +0800 |
| commit | 8e24b5a44dcffbee1444d715909a64014e11e866 (patch) | |
| tree | a2f0aaf7b582dae30d4db636efd199ccb158e0d8 /core | |
| parent | 1cf6a7f479837b471a5f91410359d86983828e6a (diff) | |
| parent | 6317ffd0fe312360eb5f6e079320c01c95870ad0 (diff) | |
Merge pull request #6001 from xmake-io/namespace
Support for namespace
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/xmake/xmake.lua | 7 | ||||
| -rw-r--r-- | core/xmake.lua | 9 |
2 files changed, 14 insertions, 2 deletions
diff --git a/core/src/xmake/xmake.lua b/core/src/xmake/xmake.lua index f5f2d9699..50438de20 100644 --- a/core/src/xmake/xmake.lua +++ b/core/src/xmake/xmake.lua @@ -2,7 +2,12 @@ target("xmake") set_kind("static") -- add deps - add_deps("sv", "lz4", "tbox") + add_deps("sv", "lz4") + if false then--namespace then + add_deps("tbox::tbox") + else + add_deps("tbox") + end if is_config("runtime", "luajit") then add_deps("luajit") else diff --git a/core/xmake.lua b/core/xmake.lua index 0d282dcdf..f27461f54 100644 --- a/core/xmake.lua +++ b/core/xmake.lua @@ -131,7 +131,14 @@ if is_plat("windows") then end -- add projects -includes("src/sv", "src/lz4", "src/tbox", "src/xmake", "src/cli") +includes("src/sv", "src/lz4", "src/xmake", "src/cli") +if false then --namespace then + namespace("tbox", function () + includes("src/tbox") + end) +else + includes("src/tbox") +end if has_config("lua_cjson") then includes("src/lua-cjson") end |