diff options
| author | ruki <[email protected]> | 2019-04-18 22:59:52 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2019-04-18 11:59:18 +0800 |
| commit | 69b9445166ac215b6c40970895d6b8600a55846d (patch) | |
| tree | 9eb771d61865e579ae0e454ec16c5688f40bab7d /xmake/modules/detect | |
| parent | fe7395793bf186b54c6ccb777b9086a9e2b5d2e9 (diff) | |
improve qt rule for android
Diffstat (limited to 'xmake/modules/detect')
| -rw-r--r-- | xmake/modules/detect/sdks/find_qt.lua | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/xmake/modules/detect/sdks/find_qt.lua b/xmake/modules/detect/sdks/find_qt.lua index 6f7b901b2..885198575 100644 --- a/xmake/modules/detect/sdks/find_qt.lua +++ b/xmake/modules/detect/sdks/find_qt.lua @@ -46,7 +46,15 @@ function _find_sdkdir(sdkdir, sdkver) elseif is_plat("mingw") then table.insert(subdirs, path.join(sdkver or "*", is_arch("x86_64") and "mingw*_64" or "mingw*_32", "bin")) elseif is_plat("android") then - table.insert(subdirs, path.join(sdkver or "*", "android_*", "bin")) + local subdir = "android_*" + if is_arch("arm64-v8a") then + subdir = "android_arm64_v8a" + elseif is_arch("armv7-a") then + subdir = "android_armv7" + elseif is_arch("i386") then + subdir = "android_x86" + end + table.insert(subdirs, path.join(sdkver or "*", subdir, "bin")) end table.insert(subdirs, path.join(sdkver or "*", "*", "bin")) table.insert(subdirs, path.join("*", "bin")) |