summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2022-12-14 23:52:30 +0800
committerruki <[email protected]>2022-12-14 23:52:30 +0800
commit3574928f7cbcdfc722c4ab35a9c0d4bf10935ec7 (patch)
tree0e984ae933acedc0d65f8ba9c45c05c6216255fd
parent638ec113fe945b0692d65d79c438655446e0832c (diff)
fix tbox xmake.sh
m---------core/src/tbox/tbox0
-rwxr-xr-xcore/src/tbox/xmake.sh21
-rwxr-xr-xcore/src/xmake/xmake.sh7
3 files changed, 10 insertions, 18 deletions
diff --git a/core/src/tbox/tbox b/core/src/tbox/tbox
-Subproject 149fa2795e69f087999b34e3fdb417a485ad187
+Subproject bee9e65c3549d03adb3a003a984c926d9dde334
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
-