diff options
| author | ruki <[email protected]> | 2021-03-26 00:49:05 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2021-03-26 00:49:05 +0800 |
| commit | 17c2672e3aae56bfe765fda6adc9abc861d7342d (patch) | |
| tree | 011a3b0816e9269ff7177634e3bfc6a0d2b4e2d3 /xmake/toolchains/xcode/load_iphoneos.lua | |
| parent | 5b414ecebb74389487c946b9c4687ec08d2c1aa9 (diff) | |
improve xcode toolchain
Diffstat (limited to 'xmake/toolchains/xcode/load_iphoneos.lua')
| -rw-r--r-- | xmake/toolchains/xcode/load_iphoneos.lua | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/xmake/toolchains/xcode/load_iphoneos.lua b/xmake/toolchains/xcode/load_iphoneos.lua index 8c6313935..b7596e7ce 100644 --- a/xmake/toolchains/xcode/load_iphoneos.lua +++ b/xmake/toolchains/xcode/load_iphoneos.lua @@ -26,10 +26,8 @@ function main(toolchain) -- init architecture local arch = toolchain:arch() - local simulator = (arch == "i386" or arch == "x86_64") - - -- init platform name - local platname = simulator and "iPhoneSimulator" or "iPhoneOS" + local xcode_sdkver = toolchain:config("xcode_sdkver") + local xcode_sysroot = toolchain:config("xcode_sysroot") -- init target minimal version local target_minver = toolchain:config("target_minver") @@ -38,25 +36,20 @@ function main(toolchain) end local target_minver_flags = (simulator and "-mios-simulator-version-min=" or "-miphoneos-version-min=") .. target_minver - -- init the xcode sdk directory - local xcode_dir = config.get("xcode") - local xcode_sdkver = toolchain:config("xcode_sdkver") - local xcode_sdkdir = format("%s/Contents/Developer/Platforms/%s.platform/Developer/SDKs/%s%s.sdk", xcode_dir, platname, platname, xcode_sdkver) - -- init flags for c/c++ - toolchain:add("cxflags", "-arch " .. arch, target_minver_flags, "-isysroot " .. xcode_sdkdir) - toolchain:add("ldflags", "-arch " .. arch, "-ObjC", "-lstdc++", "-fobjc-link-runtime", target_minver_flags, "-isysroot " .. xcode_sdkdir) - toolchain:add("shflags", "-arch " .. arch, "-ObjC", "-lstdc++", "-fobjc-link-runtime", target_minver_flags, "-isysroot " .. xcode_sdkdir) + toolchain:add("cxflags", "-arch " .. arch, target_minver_flags, "-isysroot " .. xcode_sysroot) + toolchain:add("ldflags", "-arch " .. arch, "-ObjC", "-lstdc++", "-fobjc-link-runtime", target_minver_flags, "-isysroot " .. xcode_sysroot) + toolchain:add("shflags", "-arch " .. arch, "-ObjC", "-lstdc++", "-fobjc-link-runtime", target_minver_flags, "-isysroot " .. xcode_sysroot) -- init flags for objc/c++ - toolchain:add("mxflags", "-arch " .. arch, target_minver_flags, "-isysroot " .. xcode_sdkdir) + toolchain:add("mxflags", "-arch " .. arch, target_minver_flags, "-isysroot " .. xcode_sysroot) -- init flags for asm - toolchain:add("asflags", "-arch " .. arch, target_minver_flags, "-isysroot " .. xcode_sdkdir) + toolchain:add("asflags", "-arch " .. arch, target_minver_flags, "-isysroot " .. xcode_sysroot) -- init flags for swift (with toolchain:add("ldflags and toolchain:add("shflags) - toolchain:add("scflags", format("-target %s-apple-ios%s", arch, target_minver) , "-sdk " .. xcode_sdkdir) - toolchain:add("scshflags", format("-target %s-apple-ios%s", arch, target_minver) , "-sdk " .. xcode_sdkdir) - toolchain:add("scldflags", format("-target %s-apple-ios%s", arch, target_minver) , "-sdk " .. xcode_sdkdir) + toolchain:add("scflags", format("-target %s-apple-ios%s", arch, target_minver) , "-sdk " .. xcode_sysroot) + toolchain:add("scshflags", format("-target %s-apple-ios%s", arch, target_minver) , "-sdk " .. xcode_sysroot) + toolchain:add("scldflags", format("-target %s-apple-ios%s", arch, target_minver) , "-sdk " .. xcode_sysroot) end |