diff options
| author | ruki <[email protected]> | 2019-05-23 00:46:44 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2019-05-22 22:40:27 +0800 |
| commit | 744ce235235533e695430daa1f96cbd35c69ac01 (patch) | |
| tree | 8ed3e616bbc31655eb6d8a369c5eafcba187a528 /xmake/platforms/android | |
| parent | b91f9e89bed5bf3db0f7a0e78b6c69666eab21eb (diff) | |
add ndk_stdcxx option for ndk
Diffstat (limited to 'xmake/platforms/android')
| -rw-r--r-- | xmake/platforms/android/load.lua | 2 | ||||
| -rw-r--r-- | xmake/platforms/android/xmake.lua | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/xmake/platforms/android/load.lua b/xmake/platforms/android/load.lua index 475315b72..a5259ee02 100644 --- a/xmake/platforms/android/load.lua +++ b/xmake/platforms/android/load.lua @@ -159,7 +159,7 @@ function main(platform) end -- only for c++ stl - if cxxstl_sdkdir and os.isdir(cxxstl_sdkdir) then + if config.get("ndk_stdcxx") and cxxstl_sdkdir and os.isdir(cxxstl_sdkdir) then -- the toolchains archs local toolchains_archs = diff --git a/xmake/platforms/android/xmake.lua b/xmake/platforms/android/xmake.lua index 87345da94..2ea1f9a89 100644 --- a/xmake/platforms/android/xmake.lua +++ b/xmake/platforms/android/xmake.lua @@ -48,6 +48,7 @@ platform("android") , {nil, "ndk_sdkver", "kv", "auto", "The SDK Version for NDK" } , {nil, "android_sdk", "kv", nil, "The Android SDK Directory" } , {nil, "build_toolver", "kv", nil, "The Build Tool Version of Android SDK" } + , {nil, "ndk_stdcxx", "kv", true, "Use stdc++ library for NDK" } } , global = |