summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2017-09-22 00:43:31 +0800
committerruki <[email protected]>2017-09-21 22:21:08 +0800
commit7440cc5f7f08f21682571ed33fa02e76a6b02afa (patch)
tree2285a26a7a3dc66df764360cc6cca7639da8a0aa
parentab5456ca3457c7b59de6cc590068d91d7749d096 (diff)
fix ios11 target problem for 32bit
-rw-r--r--CHANGELOG.md2
-rw-r--r--xmake/platforms/iphoneos/load.lua3
2 files changed, 5 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a08ff66b0..92c530350 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@
* Remove `and_bindings` and `add_rbindings` api
* Disable to output colors code to file
* Update project templates with tbox
+* Improve `lib.detect.find_program` interface
### Bugs fixed
@@ -381,6 +382,7 @@
* 移除`add_rbindings`和`add_bindings`接口
* 禁止在重定向的时候进行彩色输出,避免输出文件中带有色彩代码干扰
* 更新tbox工程模板
+* 改进`lib.detect.find_program`模块接口
### Bugs修复
diff --git a/xmake/platforms/iphoneos/load.lua b/xmake/platforms/iphoneos/load.lua
index 0e1bd7d24..8a6214b16 100644
--- a/xmake/platforms/iphoneos/load.lua
+++ b/xmake/platforms/iphoneos/load.lua
@@ -37,6 +37,9 @@ function main()
-- init target minimal version
local target_minver = config.get("target_minver")
+ if target_minver and tonumber(target_minver) > 10 and (arch == "armv7" or arch == "armv7s" or arch == "i386") then
+ target_minver = "10" -- iOS 10 is the maximum deployment target for 32-bit targets
+ end
local target_minver_flags = ifelse(simulator, "-mios-simulator-version-min=", "-miphoneos-version-min=") .. target_minver
-- init the xcode sdk directory