diff options
| author | ruki <[email protected]> | 2023-01-19 23:30:49 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2023-01-19 23:30:49 +0800 |
| commit | 0d836bc3b2351a72f9f28b18fb7a291220825441 (patch) | |
| tree | f8c47b94c403cb3f6699d79744b330084a2ef2dc | |
| parent | 68398872d2cdee46be82d8b097ee869278a514e7 (diff) | |
fix luajit
| -rw-r--r-- | core/src/luajit/xmake.lua | 2 | ||||
| -rwxr-xr-x | core/src/luajit/xmake.sh | 2 | ||||
| -rw-r--r-- | core/src/xmake/xmake.lua | 7 |
3 files changed, 8 insertions, 3 deletions
diff --git a/core/src/luajit/xmake.lua b/core/src/luajit/xmake.lua index 8ad0bf1af..1e6bca80a 100644 --- a/core/src/luajit/xmake.lua +++ b/core/src/luajit/xmake.lua @@ -22,7 +22,7 @@ end local autogendir = path.join("luajit", "autogen", plat, jit and "jit" or "nojit", arch) -- add target -target("lua") +target("luajit") -- make as a static library set_kind("static") diff --git a/core/src/luajit/xmake.sh b/core/src/luajit/xmake.sh index 459da8999..0a0b0002c 100755 --- a/core/src/luajit/xmake.sh +++ b/core/src/luajit/xmake.sh @@ -30,7 +30,7 @@ else fi jit_autogendir="luajit/autogen/${jit_plat}/${jit_dir}/${jit_arch}" -target "lua" +target "luajit" set_kind "static" set_default false set_warnings "all" diff --git a/core/src/xmake/xmake.lua b/core/src/xmake/xmake.lua index e100832ba..d770c129f 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", "lua-cjson", "lua", "lz4", "tbox") + add_deps("sv", "lua-cjson", "lz4", "tbox") + if is_config("runtime", "luajit") then + add_deps("luajit") + else + add_deps("lua") + end if is_plat("windows") and has_config("pdcurses") then add_deps("pdcurses") end |