summaryrefslogtreecommitdiff
path: root/xmake/platforms/android/checker.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2016-11-02 13:05:19 +0800
committerruki <[email protected]>2016-11-02 13:05:19 +0800
commite747b0d8abc2ddb6aa2595e6a522eb29d3e7d2fd (patch)
treec23a305ac2fc2c46ef036795ed1cadea4f703f7a /xmake/platforms/android/checker.lua
parent1fcfcb5ea078834548392177599a0a0340d20204 (diff)
add c++ stl search directories for android
Diffstat (limited to 'xmake/platforms/android/checker.lua')
-rw-r--r--xmake/platforms/android/checker.lua21
1 files changed, 19 insertions, 2 deletions
diff --git a/xmake/platforms/android/checker.lua b/xmake/platforms/android/checker.lua
index fa5987cf4..f34da2f2d 100644
--- a/xmake/platforms/android/checker.lua
+++ b/xmake/platforms/android/checker.lua
@@ -63,11 +63,11 @@ function _check_ndk_sdkver(config)
config.set("ndk_sdkver", ndk_sdkver)
-- trace
- print("checking for the SDK version of NDK ... android-%d", ndk_sdkver)
+ cprint("checking for the SDK version of NDK ... ${green}android-%d", ndk_sdkver)
else
-- trace
- print("checking for the SDK version of NDK ... no")
+ cprint("checking for the SDK version of NDK ... ${red}no")
end
end
end
@@ -101,6 +101,23 @@ function _check_toolchains(config)
end
end
+ -- get toolchains version
+ local toolchains = config.get("toolchains")
+ if toolchains then
+ local pos, _, toolchains_ver = toolchains:find("%-(%d*%.%d*)/")
+ if pos and toolchains_ver then
+
+ -- save the toolchains version
+ config.set("toolchains_ver", toolchains_ver)
+
+ -- trace
+ cprint("checking for the version of toolchains ... ${green}%s", toolchains_ver)
+ else
+ -- trace
+ cprint("checking for the version of toolchains ... ${red}no")
+ end
+ end
+
-- get cross
local cross = "arm-linux-androideabi-"
if arch and arch:startswith("arm64") then