diff options
| author | ruki <[email protected]> | 2018-08-16 23:21:21 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2018-08-16 14:08:07 +0800 |
| commit | 3f5a45a8d1f5d96acc4b28c9b33b4bf0c1f43665 (patch) | |
| tree | daa3b327d0747bf7f36ff8be5017d128ecfbe17a | |
| parent | 1357feb05afb1bc65dff229ccfc96aefd67101bf (diff) | |
improve load platform config if no arch
| -rw-r--r-- | xmake/platforms/iphoneos/check.lua | 2 | ||||
| -rw-r--r-- | xmake/platforms/iphoneos/load.lua | 2 | ||||
| -rw-r--r-- | xmake/platforms/macosx/load.lua | 2 | ||||
| -rw-r--r-- | xmake/platforms/windows/xmake.lua | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/xmake/platforms/iphoneos/check.lua b/xmake/platforms/iphoneos/check.lua index 4432e5960..d42e16e4c 100644 --- a/xmake/platforms/iphoneos/check.lua +++ b/xmake/platforms/iphoneos/check.lua @@ -89,7 +89,7 @@ function main(kind, toolkind) -- init the check list of config _g.config = { - { checker.check_arch, "armv7" } + { checker.check_arch, "arm64" } , checker.check_xcode , checker.check_xcode_sdkver } diff --git a/xmake/platforms/iphoneos/load.lua b/xmake/platforms/iphoneos/load.lua index 91a715d7f..aaa295ad9 100644 --- a/xmake/platforms/iphoneos/load.lua +++ b/xmake/platforms/iphoneos/load.lua @@ -29,7 +29,7 @@ import("core.project.config") function main() -- init architecture - local arch = config.get("arch") + local arch = config.get("arch") or "arm64" local simulator = (arch == "i386" or arch == "x86_64") -- init platform name diff --git a/xmake/platforms/macosx/load.lua b/xmake/platforms/macosx/load.lua index 10d74bad4..8d9ae97c4 100644 --- a/xmake/platforms/macosx/load.lua +++ b/xmake/platforms/macosx/load.lua @@ -29,7 +29,7 @@ import("core.project.config") function main() -- init flags for architecture - local arch = config.get("arch") + local arch = config.get("arch") or os.arch() local target_minver = config.get("target_minver") -- init flags for the xcode sdk directory diff --git a/xmake/platforms/windows/xmake.lua b/xmake/platforms/windows/xmake.lua index 910f8aadb..4dd509963 100644 --- a/xmake/platforms/windows/xmake.lua +++ b/xmake/platforms/windows/xmake.lua @@ -50,7 +50,7 @@ platform("windows") import("core.project.config") -- init flags for architecture - local arch = config.get("arch") + local arch = config.get("arch") or os.arch() -- init flags for asm local as = config.get("as") |