From 3574928f7cbcdfc722c4ab35a9c0d4bf10935ec7 Mon Sep 17 00:00:00 2001
From: ruki <waruqi@gmail.com>
Date: Wed, 14 Dec 2022 23:52:30 +0800
Subject: fix tbox xmake.sh

---
 core/src/tbox/tbox      |  2 +-
 core/src/tbox/xmake.sh  | 21 ++++++---------------
 core/src/xmake/xmake.sh |  7 ++++---
 3 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/core/src/tbox/tbox b/core/src/tbox/tbox
index 149fa2795..bee9e65c3 160000
--- a/core/src/tbox/tbox
+++ b/core/src/tbox/tbox
@@ -1 +1 @@
-Subproject commit 149fa2795e69f087999b34e3fdb417a485ad187e
+Subproject commit bee9e65c3549d03adb3a003a984c926d9dde334f
diff --git a/core/src/tbox/xmake.sh b/core/src/tbox/xmake.sh
index d70e0b46d..76d3ef61a 100755
--- a/core/src/tbox/xmake.sh
+++ b/core/src/tbox/xmake.sh
@@ -1,24 +1,15 @@
 #!/bin/sh
 
+set_config "hash" true
+set_config "charset" true
+set_config "force_utf8" true
+set_config "float" true
+set_config "demo" false
+
 includes "tbox/src"
 target_end
 
-# enable hash
-set_config "hash" true
 set_configvar "TB_CONFIG_MODULE_HAVE_HASH" 1
-
-# enable charset
-set_config "charset" true
 set_configvar "TB_CONFIG_MODULE_HAVE_CHARSET" 1
-
-# enable utf8
-set_config "force_utf8" true
 set_configvar "TB_CONFIG_FORCE_UTF8" 1
-
-# enable float
-set_config "float" true
 set_configvar "TB_CONFIG_TYPE_HAVE_FLOAT" 1
-
-# disable demo
-set_config "demo" false
-
diff --git a/core/src/xmake/xmake.sh b/core/src/xmake/xmake.sh
index 7b5415ac1..7bb0b9d31 100755
--- a/core/src/xmake/xmake.sh
+++ b/core/src/xmake/xmake.sh
@@ -50,11 +50,12 @@ target "xmake"
 
     # enable readline
     if has_config "readline"; then
-        add_defines "XM_CONFIG_API_HAVE_READLINE"
+        add_defines "XM_CONFIG_API_HAVE_READLINE" "{public}"
+        add_links "readline" "{public}"
     fi
 
     # enable curses
     if has_config "curses"; then
-        add_defines "XM_CONFIG_API_HAVE_CURSES"
+        add_defines "XM_CONFIG_API_HAVE_CURSES" "{public}"
+        add_links "curses" "{public}"
     fi
-
-- 
cgit v1.3.1