diff options
| author | ruki <[email protected]> | 2019-11-07 22:32:57 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2019-11-07 09:17:48 +0800 |
| commit | 22d816464bf727fc83412136ecf8efe6df7cea84 (patch) | |
| tree | a2f3ee8d8db5b6e40698006ea8a22a5e1134dd50 | |
| parent | a6e8c0224186d6948306c1312b1b6dd5cff16f43 (diff) | |
add os.version for ios
| -rw-r--r-- | xmake/modules/package/manager/conan/find_package.lua | 3 | ||||
| -rw-r--r-- | xmake/modules/package/manager/conan/install_package.lua | 13 |
2 files changed, 15 insertions, 1 deletions
diff --git a/xmake/modules/package/manager/conan/find_package.lua b/xmake/modules/package/manager/conan/find_package.lua index ab223c1cb..3dc30dc29 100644 --- a/xmake/modules/package/manager/conan/find_package.lua +++ b/xmake/modules/package/manager/conan/find_package.lua @@ -41,6 +41,7 @@ function _conan_get_arch(opt) x86 = "x86", armv7 = "armv7", armv7s = "armv7s", + arm64 = "armv8", ["arm64-v8a"] = "armv8", mips = "mips", mips64 = "mips64"} @@ -72,7 +73,7 @@ function main(name, opt) local plat = _conan_get_plat(opt) local arch = _conan_get_arch(opt) local mode = _conan_get_mode(opt) - if not plat and not arch and not mode then + if not plat or not arch or not mode then return end diff --git a/xmake/modules/package/manager/conan/install_package.lua b/xmake/modules/package/manager/conan/install_package.lua index 2d7d83c00..b463ce0ef 100644 --- a/xmake/modules/package/manager/conan/install_package.lua +++ b/xmake/modules/package/manager/conan/install_package.lua @@ -157,6 +157,7 @@ function main(name, opt) x86 = "x86", armv7 = "armv7", armv7s = "armv7s", + arm64 = "armv8", -- for iphoneos ["arm64-v8a"] = "armv8", mips = "mips", mips64 = "mips64"} @@ -188,6 +189,18 @@ function main(name, opt) table.insert(argv, "-s") table.insert(argv, "compiler.runtime=" .. opt.vs_runtime) end + elseif opt.plat == "iphoneos" then + -- TODO + local target_minver = config.get("target_minver") + if target_minver and tonumber(target_minver) > 10 and (arch == "armv7" or arch == "armv7s" or arch == "x86") then + target_minver = "10" -- iOS 10 is the maximum deployment target for 32-bit targets + end + if target_minver then + table.insert(argv, "-s") + table.insert(argv, "os.version=" .. target_minver) + end + elseif opt.plat == "android" then + -- TODO end -- set custom settings |