support watchos for xcode toolchain

4 files changed, 19 insertions, 31 deletions

diff --git a/xmake/platforms/watchos/xmake.lua b/xmake/platforms/watchos/xmake.lua
index 1311c47ba..1356af3ab 100644
--- a/xmake/platforms/watchos/xmake.lua
+++ b/xmake/platforms/watchos/xmake.lua
@@ -36,8 +36,8 @@ platform("watchos")
     -- on check 
     on_check("check")
 
-    -- on load
-    on_load("load")
+    -- set toolchains
+    set_toolchains("xcode")
 
     -- set menu
     set_menu {
diff --git a/xmake/toolchains/xcode/load_macosx.lua b/xmake/toolchains/xcode/load_macosx.lua
index b735b8d77..5cebd96bb 100644
--- a/xmake/toolchains/xcode/load_macosx.lua
+++ b/xmake/toolchains/xcode/load_macosx.lua
@@ -64,8 +64,6 @@ function main(toolchain)
     end
 
     -- init flags for asm 
---    toolchain:add("yasm.asflags", arch == "x86_64" and "macho64" or "macho32")
---    toolchain:set("fasm.asflags", "")
     toolchain:add("asflags", "-arch " .. arch)
     if xcode_sdkdir then
         toolchain:add("asflags", "-isysroot " .. xcode_sdkdir)
@@ -77,18 +75,4 @@ function main(toolchain)
         toolchain:add("scshflags", format("-target %s-apple-macosx%s", arch, target_minver) , "-sdk " .. xcode_sdkdir)
         toolchain:add("scldflags", format("-target %s-apple-macosx%s", arch, target_minver) , "-sdk " .. xcode_sdkdir)
     end
-
-    --[[
-    -- init flags for golang
-    toolchain:set("gcldflags", "")
-
-    -- init flags for dlang
-    local dc_archs = { i386 = "-m32", x86_64 = "-m64" }
-    toolchain:add("dcflags", dc_archs[arch] or "")
-    toolchain:add("dcshflags", dc_archs[arch] or "")
-    toolchain:add("dcldflags", dc_archs[arch] or "" )
-
-    -- init flags for rust
-    toolchain:set("rcshflags", "")
-    toolchain:set("rcldflags", "")]]
 end
diff --git a/xmake/platforms/watchos/load.lua b/xmake/toolchains/xcode/load_watchos.lua
index 2e0204358..5048f4bb7 100644
--- a/xmake/platforms/watchos/load.lua
+++ b/xmake/toolchains/xcode/load_watchos.lua
@@ -1,4 +1,4 @@
---!A cross-platform build utility based on Lua
+--!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.
@@ -15,14 +15,14 @@
 -- Copyright (C) 2015-2020, TBOOX Open Source Group.
 --
 -- @author      ruki
--- @file        load.lua
+-- @file        load_watchos.lua
 --
 
 -- imports
 import("core.project.config")
 
--- load it
-function main(platform)
+-- main entry
+function main(toolchain)
 
     -- init architecture
     local arch = config.get("arch")
@@ -41,19 +41,19 @@ function main(platform)
     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++
-    platform:add("cxflags", "-arch " .. arch, target_minver_flags, "-isysroot " .. xcode_sdkdir)
-    platform:add("ldflags", "-arch " .. arch, "-ObjC", "-lstdc++", "-fobjc-link-runtime", target_minver_flags, "-isysroot " .. xcode_sdkdir)
-    platform: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_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++
-    platform:add("mxflags", "-arch " .. arch, target_minver_flags, "-isysroot " .. xcode_sdkdir)
+    toolchain:add("mxflags", "-arch " .. arch, target_minver_flags, "-isysroot " .. xcode_sdkdir)
 
     -- init flags for asm
-    platform:add("asflags", "-arch " .. arch, target_minver_flags, "-isysroot " .. xcode_sdkdir)
+    toolchain:add("asflags", "-arch " .. arch, target_minver_flags, "-isysroot " .. xcode_sdkdir)
 
-    -- init flags for swift (with platform:add("ldflags and platform:add("shflags)
-    platform:add("scflags", format("-target %s-apple-ios%s", arch, target_minver) , "-sdk " .. xcode_sdkdir)
-    platform:add("scshflags", format("-target %s-apple-ios%s", arch, target_minver) , "-sdk " .. xcode_sdkdir) 
-    platform:add("scldflags", format("-target %s-apple-ios%s", arch, target_minver) , "-sdk " .. 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/xmake.lua b/xmake/toolchains/xcode/xmake.lua
index 4f45f6d60..f20fabe1f 100644
--- a/xmake/toolchains/xcode/xmake.lua
+++ b/xmake/toolchains/xcode/xmake.lua
@@ -35,6 +35,10 @@ toolchain("xcode")
             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 "
+        elseif is_plat("watchos") then
+            local arch = get_config("arch") or os.arch()
+            local simulator = (arch == "i386")
+            cross = simulator and "xcrun -sdk watchsimulator " or "xcrun -sdk watchos "
         else
             raise("unknown platform for xcode!")
         end