diff options
| author | ruki <[email protected]> | 2020-02-21 00:44:53 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2020-02-20 22:29:20 +0800 |
| commit | 9dfb87323ac852553ceaf08ffcd4cfc473d2e442 (patch) | |
| tree | 4913617a4e4f0c7d048bf234805ef97d923aef0d /xmake/actions | |
| parent | c27abd8d18c5a4a3b3d0482072d65c56abf146d3 (diff) | |
add ndkbuild for trybuild
Diffstat (limited to 'xmake/actions')
| -rw-r--r-- | xmake/actions/build/main.lua | 2 | ||||
| -rw-r--r-- | xmake/actions/config/xmake.lua | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/xmake/actions/build/main.lua b/xmake/actions/build/main.lua index cc3731800..86bacecbf 100644 --- a/xmake/actions/build/main.lua +++ b/xmake/actions/build/main.lua @@ -55,7 +55,7 @@ function _try_build() raise("unknown build tool: %s", trybuild) end else - for _, name in ipairs({"autotools", "cmake", "meson", "scons", "bazel", "msbuild", "xcodebuild", "make", "ninja"}) do + for _, name in ipairs({"autotools", "cmake", "meson", "scons", "bazel", "msbuild", "xcodebuild", "make", "ninja", "ndkbuild"}) do tool = import("private.action.trybuild." .. name, {anonymous = true}) configfile = tool.detect() if configfile then diff --git a/xmake/actions/config/xmake.lua b/xmake/actions/config/xmake.lua index 01448ffbe..ace84c4b0 100644 --- a/xmake/actions/config/xmake.lua +++ b/xmake/actions/config/xmake.lua @@ -57,7 +57,7 @@ task("config") " - xmake f --trybuild=autotools -p android --ndk=xxx; xmake", "", "the third-party buildsystems:" - , values = {"auto", "make", "autotools", "cmake", "scons", "meson", "bazel", "ninja", "msbuild", "xcodebuild"}} + , values = {"auto", "make", "autotools", "cmake", "scons", "meson", "bazel", "ninja", "msbuild", "xcodebuild", "ndkbuild"}} , {nil, "tryconfigs", "kv", nil , "Set the extra configurations of the third-party buildsystem for the try-build mode.", "e.g.", " - xmake f --trybuild=autotools --tryconfigs='--enable-shared=no'"} |