improve ndk toolchain

3 files changed, 26 insertions, 5 deletions

diff --git a/xmake/toolchains/msvc/xmake.lua b/xmake/toolchains/msvc/xmake.lua
index 2b9f4eb1e..a79cb4268 100644
--- a/xmake/toolchains/msvc/xmake.lua
+++ b/xmake/toolchains/msvc/xmake.lua
@@ -18,7 +18,17 @@
 -- @file        xmake.lua
 --
 
--- define toolchain
+-- msvc toolchain
+--
+-- @param vs    the vs version
+--
+-- @code
+-- target("test")
+--     ...
+--     set_toolchains("msvc")
+--     set_toolchains("msvc", {vs = "2019"})
+-- @endcode
+--
 toolchain("msvc")
 
     -- set homepage
diff --git a/xmake/toolchains/ndk/check.lua b/xmake/toolchains/ndk/check.lua
index 583e6d591..9f54cdb9a 100644
--- a/xmake/toolchains/ndk/check.lua
+++ b/xmake/toolchains/ndk/check.lua
@@ -25,13 +25,13 @@ import("detect.sdks.find_android_sdk")
 
 -- check the ndk toolchain
 function _check_ndk(toolchain)
-    local ndk = find_ndk(toolchain:config("ndk") or config.get("ndk"), {force = true, verbose = true})
+    local ndk = find_ndk(toolchain:config("ndk") or config.get("ndk"), {force = true, verbose = true, sdkver = toolchain:config("sdkver")})
     if not ndk then
         -- find it from packages
         for _, package in ipairs(toolchain:packages()) do
             local installdir = package:installdir()
             if installdir and os.isdir(installdir) then
-                ndk = find_ndk(installdir, {force = true, verbose = true})
+                ndk = find_ndk(installdir, {force = true, verbose = true, sdkver = toolchain:config("sdkver")})
                 if ndk then
                     break
                 end
@@ -49,11 +49,12 @@ function _check_ndk(toolchain)
         toolchain:config_set("ndk_sysroot", ndk.sysroot)
         toolchain:configs_save()
     else
+        --[[TODO
         -- failed
         cprint("${bright color.error}please run:")
         cprint("    - xmake config --ndk=xxx")
         cprint("or  - xmake global --ndk=xxx")
-        raise()
+        raise()]]
     end
 end
 
diff --git a/xmake/toolchains/ndk/xmake.lua b/xmake/toolchains/ndk/xmake.lua
index 099deeae9..609efb4a2 100644
--- a/xmake/toolchains/ndk/xmake.lua
+++ b/xmake/toolchains/ndk/xmake.lua
@@ -18,7 +18,17 @@
 -- @file        xmake.lua
 --
 
--- define toolchain
+-- android ndk toolchain
+--
+-- @param sdkver    the platform sdk version
+--
+-- @code
+-- target("test")
+--     ...
+--     set_toolchains("ndk")
+--     set_toolchains("ndk", {sdkver = "23"})
+-- @endcode
+--
 toolchain("ndk")
 
     -- set homepage