impl target minver for xcode

6 files changed, 16 insertions, 17 deletions

diff --git a/xmake/platforms/checker.lua b/xmake/platforms/checker.lua
index 88306ffb2..bcacbdfa0 100644
--- a/xmake/platforms/checker.lua
+++ b/xmake/platforms/checker.lua
@@ -134,19 +134,18 @@ function check_target_minver(config)
     local target_minver = config.get("target_minver")
     if not target_minver then
 
-        -- TODO
         -- the default versions
         local versions =
         {
             macosx          = "10.9"
         ,   iphoneos        = "7.0"
         ,   iphonesimulator = "7.0"
-        ,   watchos         = "7.0"
-        ,   watchsimulator  = "7.0"
+        ,   watchos         = "2.1"
+        ,   watchsimulator  = "2.1"
         }
 
         -- init the default target minimal version
-        config.set("target_minver", versions[config.get("plat")])
+        config.set("target_minver", config.get("xcode_sdkver") or versions[config.get("plat")])
 
         -- trace
         print("checking for the target minimal version ... %s", config.get("target_minver"))
diff --git a/xmake/platforms/iphonesimulator/xmake.lua b/xmake/platforms/iphonesimulator/xmake.lua
index fad40dddb..7da73fefc 100755
--- a/xmake/platforms/iphonesimulator/xmake.lua
+++ b/xmake/platforms/iphonesimulator/xmake.lua
@@ -69,8 +69,8 @@ platform("iphonesimulator")
         _g.cxflags = { "-arch " .. arch, "-mios-simulator-version-min=" .. target_minver }
         _g.mxflags = { "-arch " .. arch, "-mios-simulator-version-min=" .. target_minver }
         _g.asflags = { "-arch " .. arch, "-mios-simulator-version-min=" .. target_minver }
-        _g.ldflags = { "-arch " .. arch, "-ObjC", "-lstdc++", "-fobjc-link-runtime", "-miphonesimulator-version-min=" .. target_minver }
-        _g.shflags = { "-arch " .. arch, "-ObjC", "-lstdc++", "-fobjc-link-runtime", "-miphonesimulator-version-min=" .. target_minver }
+        _g.ldflags = { "-arch " .. arch, "-ObjC", "-lstdc++", "-fobjc-link-runtime", "-mios-simulator-version-min=" .. target_minver }
+        _g.shflags = { "-arch " .. arch, "-ObjC", "-lstdc++", "-fobjc-link-runtime", "-mios-simulator-version-min=" .. target_minver }
         _g.ldflags = { "-arch " .. arch, "-Xlinker -objc_abi_version", "-Xlinker 2 -stdlib=libc++", "-Xlinker -no_implicit_dylibs", "-fobjc-link-runtime", "-mios-simulator-version-min=" .. target_minver }
         _g.shflags = { "-arch " .. arch, "-Xlinker -objc_abi_version", "-Xlinker 2 -stdlib=libc++", "-Xlinker -no_implicit_dylibs", "-fobjc-link-runtime", "-mios-simulator-version-min=" .. target_minver }
         _g.scflags = { format("-target %s-apple-ios%s", arch, target_minver) }
diff --git a/xmake/platforms/watchos/checker.lua b/xmake/platforms/watchos/checker.lua
index 231118751..59e580dba 100644
--- a/xmake/platforms/watchos/checker.lua
+++ b/xmake/platforms/watchos/checker.lua
@@ -64,7 +64,7 @@ function init()
     -- init the check list of config
     _g.config = 
     {
-        { checker.check_arch, "armv7" }
+        { checker.check_arch, "armv7k" }
     ,   checker.check_xcode
     ,   checker.check_xcode_sdkver
     ,   checker.check_target_minver
diff --git a/xmake/platforms/watchos/xmake.lua b/xmake/platforms/watchos/xmake.lua
index 028331de5..c152b9cee 100755
--- a/xmake/platforms/watchos/xmake.lua
+++ b/xmake/platforms/watchos/xmake.lua
@@ -30,7 +30,7 @@ platform("watchos")
     set_platform_hosts("macosx")
 
     -- set archs
-    set_platform_archs("armv7", "armv7s", "arm64")
+    set_platform_archs("armv7k")
 
     -- set checker
     set_platform_checker("checker")
diff --git a/xmake/platforms/watchsimulator/checker.lua b/xmake/platforms/watchsimulator/checker.lua
index a30d135ea..ad39fa36c 100644
--- a/xmake/platforms/watchsimulator/checker.lua
+++ b/xmake/platforms/watchsimulator/checker.lua
@@ -50,7 +50,7 @@ function init()
     -- init the check list of config
     _g.config = 
     {
-        { checker.check_arch, "x86_64" }
+        { checker.check_arch, "i386" }
     ,   checker.check_xcode
     ,   checker.check_xcode_sdkver
     ,   checker.check_target_minver
diff --git a/xmake/platforms/watchsimulator/xmake.lua b/xmake/platforms/watchsimulator/xmake.lua
index 7530f252b..d2c2f6ae4 100755
--- a/xmake/platforms/watchsimulator/xmake.lua
+++ b/xmake/platforms/watchsimulator/xmake.lua
@@ -30,7 +30,7 @@ platform("watchsimulator")
     set_platform_hosts("macosx")
 
     -- set archs
-    set_platform_archs("i386", "x86_64")
+    set_platform_archs("i386")
 
     -- set checker
     set_platform_checker("checker")
@@ -66,13 +66,13 @@ platform("watchsimulator")
         -- init flags for architecture
         local arch          = config.get("arch")
         local target_minver = config.get("target_minver")
-        _g.cxflags = { "-arch " .. arch, "-mios-simulator-version-min=" .. target_minver }
-        _g.mxflags = { "-arch " .. arch, "-mios-simulator-version-min=" .. target_minver }
-        _g.asflags = { "-arch " .. arch, "-mios-simulator-version-min=" .. target_minver }
-        _g.ldflags = { "-arch " .. arch, "-ObjC", "-lstdc++", "-fobjc-link-runtime", "-mwatchsimulator-version-min=" .. target_minver }
-        _g.shflags = { "-arch " .. arch, "-ObjC", "-lstdc++", "-fobjc-link-runtime", "-mwatchsimulator-version-min=" .. target_minver }
-        _g.ldflags = { "-arch " .. arch, "-Xlinker -objc_abi_version", "-Xlinker 2 -stdlib=libc++", "-Xlinker -no_implicit_dylibs", "-fobjc-link-runtime", "-mios-simulator-version-min=" .. target_minver }
-        _g.shflags = { "-arch " .. arch, "-Xlinker -objc_abi_version", "-Xlinker 2 -stdlib=libc++", "-Xlinker -no_implicit_dylibs", "-fobjc-link-runtime", "-mios-simulator-version-min=" .. target_minver }
+        _g.cxflags = { "-arch " .. arch, "-mwatchos-simulator-version-min=" .. target_minver }
+        _g.mxflags = { "-arch " .. arch, "-mwatchos-simulator-version-min=" .. target_minver }
+        _g.asflags = { "-arch " .. arch, "-mwatchos-simulator-version-min=" .. target_minver }
+        _g.ldflags = { "-arch " .. arch, "-ObjC", "-lstdc++", "-fobjc-link-runtime", "-mwatchos-simulator-version-min=" .. target_minver }
+        _g.shflags = { "-arch " .. arch, "-ObjC", "-lstdc++", "-fobjc-link-runtime", "-mwatchos-simulator-version-min=" .. target_minver }
+        _g.ldflags = { "-arch " .. arch, "-Xlinker -objc_abi_version", "-Xlinker 2 -stdlib=libc++", "-Xlinker -no_implicit_dylibs", "-fobjc-link-runtime", "-mwatchos-simulator-version-min=" .. target_minver }
+        _g.shflags = { "-arch " .. arch, "-Xlinker -objc_abi_version", "-Xlinker 2 -stdlib=libc++", "-Xlinker -no_implicit_dylibs", "-fobjc-link-runtime", "-mwatchos-simulator-version-min=" .. target_minver }
         _g.scflags = { format("-target %s-apple-ios%s", arch, target_minver) }
 
         -- init flags for the xcode sdk directory