diff options
| author | ruki <[email protected]> | 2020-07-17 16:02:19 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-07-17 16:02:19 +0800 |
| commit | f9a4493f60eeb9078c00a112734d8caa7e29604e (patch) | |
| tree | 9fd76a4b3ee0fea7eaa28dbf0df3976c3db36b34 /core/src/xmake | |
| parent | c3dd85b98492c012fc4eb1b46fac824051a1b92a (diff) | |
| parent | 6b3cf4e5239f3f041501d0d8ee32471f33010708 (diff) | |
Merge pull request #894 from xmake-io/json
Add Json Support
Diffstat (limited to 'core/src/xmake')
| -rw-r--r-- | core/src/xmake/engine.c | 9 | ||||
| -rw-r--r-- | core/src/xmake/xmake.lua | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/core/src/xmake/engine.c b/core/src/xmake/engine.c index cf361a8c5..fb6205ac5 100644 --- a/core/src/xmake/engine.c +++ b/core/src/xmake/engine.c @@ -224,6 +224,11 @@ tb_int_t xm_semver_select(lua_State* lua); tb_int_t xm_curses_register(lua_State* lua); #endif +// open cjson +__tb_extern_c_enter__ +tb_int_t luaopen_cjson(lua_State *l); +__tb_extern_c_leave__ + /* ////////////////////////////////////////////////////////////////////////////////////// * globals */ @@ -849,6 +854,10 @@ xm_engine_ref_t xm_engine_init(tb_char_t const* name, xm_engine_lni_initalizer_c lua_setglobal(engine->lua, "curses"); #endif + // bind json + luaopen_cjson(engine->lua); + lua_setglobal(engine->lua, "json"); + // init host xm_engine_init_host(engine); diff --git a/core/src/xmake/xmake.lua b/core/src/xmake/xmake.lua index d85b2802f..eb2cc62b9 100644 --- a/core/src/xmake/xmake.lua +++ b/core/src/xmake/xmake.lua @@ -8,7 +8,7 @@ target("xmake") if has_config("curses") or has_config("pdcurses") then add_deps("lcurses") end - add_deps("sv", "luajit", "tbox") + add_deps("sv", "luajit", "lua-cjson", "tbox") -- add defines add_defines("__tb_prefix__=\"xmake\"") |