find deps for xmake.sh

2 files changed, 14 insertions, 2 deletions

diff --git a/core/src/xmake/xmake.sh b/core/src/xmake/xmake.sh
index 983dc95ea..6c42c9618 100755
--- a/core/src/xmake/xmake.sh
+++ b/core/src/xmake/xmake.sh
@@ -5,7 +5,12 @@ target "xmake"
     set_default false
 
     # add deps
-    add_deps "sv" "lua_cjson" "lua" "lz4" "tbox"
+    add_deps "sv" "lua" "lz4" "tbox"
+    if has_config "lua_cjson"; then
+        add_links "cjson" "{public}"
+    else
+        add_deps "lua_cjson"
+    fi
 
     # add defines
     add_defines "__tb_prefix__=\"xmake\""
diff --git a/core/xmake.sh b/core/xmake.sh
index 21c7db319..0b624a6c9 100755
--- a/core/xmake.sh
+++ b/core/xmake.sh
@@ -42,8 +42,15 @@ option "curses"
     add_cincludes "curses.h"
 option_end
 
+# the lua-cjson option
+option "lua_cjson"
+    add_links "cjson"
+option_end
+
 # add projects
-includes "src/lua-cjson"
+if ! has_config "lua_cjson"; then
+    includes "src/lua-cjson"
+fi
 includes "src/sv"
 includes "src/lz4"
 includes "src/tbox"