support iphoneos for xcode toolchain

3 files changed, 96 insertions, 18 deletions

diff --git a/xmake/toolchains/xcode/load_iphoneos.lua b/xmake/toolchains/xcode/load_iphoneos.lua
new file mode 100644
index 000000000..3aeb78672
--- /dev/null
+++ b/xmake/toolchains/xcode/load_iphoneos.lua
@@ -0,0 +1,62 @@
+--!A cross-toolchain build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+-- 
+-- Copyright (C) 2015-2020, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        load_iphoneos.lua
+--
+
+-- imports
+import("core.project.config")
+
+-- main entry
+function main(toolchain)
+
+    -- init architecture
+    local arch = config.get("arch") or "arm64"
+    local simulator = (arch == "i386" or arch == "x86_64")
+
+    -- init platform name
+    local platname = simulator and "iPhoneSimulator" or "iPhoneOS"
+
+    -- 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 = (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  = config.get("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)
+
+    -- init flags for objc/c++
+    toolchain:add("mxflags", "-arch " .. arch, target_minver_flags, "-isysroot " .. xcode_sdkdir)
+
+    -- init flags for asm
+    toolchain:add("asflags", "-arch " .. arch, target_minver_flags, "-isysroot " .. xcode_sdkdir)
+
+    -- 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)
+end
+
diff --git a/xmake/toolchains/xcode/load.lua b/xmake/toolchains/xcode/load_macosx.lua
index 4d4165a7e..b735b8d77 100644
--- a/xmake/toolchains/xcode/load.lua
+++ b/xmake/toolchains/xcode/load_macosx.lua
@@ -15,7 +15,7 @@
 -- Copyright (C) 2015-2020, TBOOX Open Source Group.
 --
 -- @author      ruki
--- @file        load.lua
+-- @file        load_macosx.lua
 --
 
 -- imports
diff --git a/xmake/toolchains/xcode/xmake.lua b/xmake/toolchains/xcode/xmake.lua
index d9b1d9944..4f45f6d60 100644
--- a/xmake/toolchains/xcode/xmake.lua
+++ b/xmake/toolchains/xcode/xmake.lua
@@ -21,24 +21,40 @@
 -- define toolchain
 toolchain("xcode")
 
-    -- set toolsets
-    set_toolsets("cc", "xcrun -sdk macosx clang")
-    set_toolsets("cxx", "xcrun -sdk macosx clang", "xcrun -sdk macosx clang++")
-    set_toolsets("as", "xcrun -sdk macosx clang")
-    set_toolsets("ld", "xcrun -sdk macosx clang++", "xcrun -sdk macosx clang")
-    set_toolsets("sh", "xcrun -sdk macosx clang++", "xcrun -sdk macosx clang")
-    set_toolsets("ar", "xcrun -sdk macosx ar")
-    set_toolsets("ex", "xcrun -sdk macosx ar")
-    set_toolsets("strip", "xcrun -sdk macosx strip")
-    set_toolsets("dsymutil", "xcrun -sdk macosx dsymutil", "dsymutil")
-    set_toolsets("mm", "xcrun -sdk macosx clang")
-    set_toolsets("mxx", "xcrun -sdk macosx clang", "xcrun -sdk macosx clang++")
-    set_toolsets("sc", "xcrun -sdk macosx swiftc", "swiftc")
-    set_toolsets("scld", "xcrun -sdk macosx swiftc", "swiftc")
-    set_toolsets("scsh", "xcrun -sdk macosx swiftc", "swiftc")
-
     -- check toolchain
     on_check("check")
 
     -- load toolchain
-    on_load("load")
+    on_load(function (toolchain)
+
+        -- get cross
+        local cross
+        if is_plat("macosx") then
+            cross = "xcrun -sdk macosx "
+        elseif is_plat("iphoneos") then
+            local arch = get_config("arch") or os.arch()
+            local simulator = (arch == "i386" or arch == "x86_64")
+            cross = simulator and "xcrun -sdk iphonesimulator " or "xcrun -sdk iphoneos "
+        else
+            raise("unknown platform for xcode!")
+        end
+
+        -- set toolsets
+        toolchain:set("toolsets", "cc", cross .. "clang")
+        toolchain:set("toolsets", "cxx", cross .. "clang", cross .. "clang++")
+        toolchain:set("toolsets", "as", cross .. "clang")
+        toolchain:set("toolsets", "ld", cross .. "clang++", cross .. "clang")
+        toolchain:set("toolsets", "sh", cross .. "clang++", cross .. "clang")
+        toolchain:set("toolsets", "ar", cross .. "ar")
+        toolchain:set("toolsets", "ex", cross .. "ar")
+        toolchain:set("toolsets", "strip", cross .. "strip")
+        toolchain:set("toolsets", "dsymutil", cross .. "dsymutil", "dsymutil")
+        toolchain:set("toolsets", "mm", cross .. "clang")
+        toolchain:set("toolsets", "mxx", cross .. "clang", cross .. "clang++")
+        toolchain:set("toolsets", "sc", cross .. "swiftc", "swiftc")
+        toolchain:set("toolsets", "scld", cross .. "swiftc", "swiftc")
+        toolchain:set("toolsets", "scsh", cross .. "swiftc", "swiftc")
+
+        -- load configurations
+        import("load_" .. get_config("plat"))(toolchain)
+    end)