diff options
| author | ruki <[email protected]> | 2022-12-17 20:27:08 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2022-12-17 20:27:52 +0800 |
| commit | 5d7efff981b2bb2c8806eb57354a73dac7ccd2f1 (patch) | |
| tree | 4f52d578a8d2e31f116a73da6ff0acfb527326ee /core/src | |
| parent | 6bea48d5f42e1baf8cc2a6080ca5cf62aaac9766 (diff) | |
find lua
Diffstat (limited to 'core/src')
| -rwxr-xr-x | core/src/lua-cjson/xmake.sh | 6 | ||||
| -rwxr-xr-x | core/src/xmake/xmake.sh | 11 |
2 files changed, 14 insertions, 3 deletions
diff --git a/core/src/lua-cjson/xmake.sh b/core/src/lua-cjson/xmake.sh index 7ee38cc10..42e767218 100755 --- a/core/src/lua-cjson/xmake.sh +++ b/core/src/lua-cjson/xmake.sh @@ -4,7 +4,11 @@ target "lua_cjson" set_kind "static" set_default false set_warnings "all" - add_deps "lua" + if has_config "lua"; then + add_options "lua" "{public}" + else + add_deps "lua" + fi add_files "lua-cjson/dtoa.c" add_files "lua-cjson/lua_cjson.c" add_files "lua-cjson/strbuf.c" diff --git a/core/src/xmake/xmake.sh b/core/src/xmake/xmake.sh index 46cb36ca1..2fc04b8e4 100755 --- a/core/src/xmake/xmake.sh +++ b/core/src/xmake/xmake.sh @@ -5,8 +5,15 @@ target "xmake" set_default false # add deps - add_deps "sv" "lua" "lz4" "tbox" - add_lua_cjson + add_deps "sv" "lz4" "tbox" + local libs="lua_cjson lua" + for lib in $libs; do + if has_config "$lib"; then + add_options "$lib" "{public}" + else + add_deps "$lib" + fi + done # add defines add_defines "__tb_prefix__=\"xmake\"" |