diff options
| author | ruki <[email protected]> | 2022-12-13 23:28:45 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2022-12-13 23:28:45 +0800 |
| commit | ebc176854cf1680a826ec9766e7ef53dfbdba0da (patch) | |
| tree | 5ff7b6fbda67cab10ee75d414dee52ae66f7dc03 | |
| parent | 06876b8b33ae91a5dd12f8b94b295f3546885c8a (diff) | |
format code
| -rw-r--r-- | xmake/modules/detect/sdks/find_emsdk.lua | 14 | ||||
| -rw-r--r-- | xmake/platforms/wasm/xmake.lua | 8 |
2 files changed, 4 insertions, 18 deletions
diff --git a/xmake/modules/detect/sdks/find_emsdk.lua b/xmake/modules/detect/sdks/find_emsdk.lua index 52f47079d..55a66f9ae 100644 --- a/xmake/modules/detect/sdks/find_emsdk.lua +++ b/xmake/modules/detect/sdks/find_emsdk.lua @@ -28,16 +28,12 @@ import("lib.detect.find_file") -- find sdk directory function _find_emsdkdir(sdkdir) - - -- try to find emsdk.py local paths = {} if sdkdir then table.insert(paths, sdkdir) end table.insert(paths, "$(env EMSDK)") local emsdk = find_file("emsdk.py", paths, {suffixes = subdirs}) - - -- get sdk directory if emsdk then return path.directory(emsdk) end @@ -54,16 +50,12 @@ function _find_emsdk(sdkdir) -- find emscripten toolchain directory local emscripten - local subdirs = {} table.insert(subdirs, path.join("upstream", "emscripten")) - local emcc = find_file("emcc", sdkdir, {suffixes = subdirs}) if emcc then emscripten = path.directory(emcc) end - - -- ok? return {sdkdir = sdkdir, emscripten = emscripten} end @@ -96,18 +88,12 @@ function main(sdkdir, opt) -- find sdk local sdk = _find_emsdk(sdkdir or config.get("emsdk") or global.get("emsdk")) if sdk and sdk.sdkdir then - - -- save to config config.set("emsdk", sdk.sdkdir, {force = true, readonly = true}) - - -- trace if opt.verbose or option.get("verbose") then cprint("checking for emsdk directory ... ${color.success}%s", sdk.sdkdir) end else - - -- trace if opt.verbose or option.get("verbose") then cprint("checking for emsdk directory ... ${color.nothing}${text.nothing}") end diff --git a/xmake/platforms/wasm/xmake.lua b/xmake/platforms/wasm/xmake.lua index 578620384..8e794b9e7 100644 --- a/xmake/platforms/wasm/xmake.lua +++ b/xmake/platforms/wasm/xmake.lua @@ -44,13 +44,13 @@ platform("wasm") set_menu { config = { - {category = "Emscripten Configuration" } - , {nil, "emsdk", "kv", nil, "emsdk directory" } + {category = "Emscripten Configuration" } + , {nil, "emsdk", "kv", nil, "The emsdk directory" } } , global = { - {category = "Emscripten Configuration" } - , {nil, "emsdk", "kv", nil, "emsdk directory" } + {category = "Emscripten Configuration" } + , {nil, "emsdk", "kv", nil, "The emsdk directory" } } } |