From 68398872d2cdee46be82d8b097ee869278a514e7 Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 19 Jan 2023 23:29:01 +0800 Subject: fix xmake.sh --- core/xmake.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/core/xmake.sh b/core/xmake.sh index d093af445..d464b2862 100755 --- a/core/xmake.sh +++ b/core/xmake.sh @@ -209,14 +209,17 @@ option_find_tbox() { # add projects if ! has_config "external"; then - if ! has_config "lua"; then - if is_config "runtime" "luajit"; then + if is_config "runtime" "luajit"; then + if ! has_config "luajit"; then includes "src/luajit" - else + fi + if ! has_config "lua_cjson"; then + includes "src/lua-cjson" + fi + else + if ! has_config "lua"; then includes "src/lua" fi - fi - if ! has_config "lua_cjson" || is_config "runtime" "lua"; then includes "src/lua-cjson" fi if ! has_config "lz4"; then -- cgit v1.3.1