add some options

2 files changed, 6 insertions, 11 deletions

diff --git a/core/src/xmake/xmake.sh b/core/src/xmake/xmake.sh
index 93ca26cfc..f3e1de128 100755
--- a/core/src/xmake/xmake.sh
+++ b/core/src/xmake/xmake.sh
@@ -22,6 +22,9 @@ target "xmake"
         add_deps "lua"
     fi
 
+    # add options
+    add_options "readline" "curses" "{public}"
+
     # add defines
     add_defines "__tb_prefix__=\"xmake\""
     if is_mode "debug"; then
@@ -59,14 +62,3 @@ target "xmake"
         add_files "winos/*.c"
     fi
 
-    # enable readline
-    if has_config "readline"; then
-        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" "{public}"
-        add_links "curses" "{public}"
-    fi
diff --git a/core/xmake.sh b/core/xmake.sh
index 9b1640ecc..a1188737c 100755
--- a/core/xmake.sh
+++ b/core/xmake.sh
@@ -35,11 +35,14 @@ option "readline"
     add_links "readline"
     add_cincludes "readline/readline.h"
     add_cfuncs "readline"
+    add_defines "XM_CONFIG_API_HAVE_READLINE"
+option_end
 
 # the curses option
 option "curses"
     add_links "curses"
     add_cincludes "curses.h"
+    add_defines "XM_CONFIG_API_HAVE_CURSES"
 option_end
 
 # the lua-cjson option