summaryrefslogtreecommitdiff
path: root/xmake/scripts/platform
diff options
context:
space:
mode:
Diffstat (limited to 'xmake/scripts/platform')
-rw-r--r--xmake/scripts/platform/iphoneos/iphoneos.lua1
-rw-r--r--xmake/scripts/platform/iphoneos/prober.lua1
-rw-r--r--xmake/scripts/platform/iphonesimulator/iphonesimulator.lua1
-rw-r--r--xmake/scripts/platform/iphonesimulator/prober.lua1
-rw-r--r--xmake/scripts/platform/macosx/macosx.lua4
-rw-r--r--xmake/scripts/platform/macosx/prober.lua1
6 files changed, 9 insertions, 0 deletions
diff --git a/xmake/scripts/platform/iphoneos/iphoneos.lua b/xmake/scripts/platform/iphoneos/iphoneos.lua
index ff9ddfdc0..282d3fe52 100644
--- a/xmake/scripts/platform/iphoneos/iphoneos.lua
+++ b/xmake/scripts/platform/iphoneos/iphoneos.lua
@@ -57,6 +57,7 @@ function iphoneos.make(configs)
configs.tools.ar = config.get("ar")
configs.tools.sh = config.get("sh")
configs.tools.ex = config.get("ar")
+ configs.tools.sc = config.get("sc")
configs.tools.lipo = config.get("lipo")
-- init flags for architecture
diff --git a/xmake/scripts/platform/iphoneos/prober.lua b/xmake/scripts/platform/iphoneos/prober.lua
index ae17a74c9..ac2e45838 100644
--- a/xmake/scripts/platform/iphoneos/prober.lua
+++ b/xmake/scripts/platform/iphoneos/prober.lua
@@ -239,6 +239,7 @@ function prober._probe_toolchains(configs)
if not prober._probe_toolpath(configs, "ld", "xcrun -sdk iphoneos ", "clang++", "the linker") then return false end
if not prober._probe_toolpath(configs, "ar", "xcrun -sdk iphoneos ", "ar", "the static library linker") then return false end
if not prober._probe_toolpath(configs, "sh", "xcrun -sdk iphoneos ", "clang++", "the shared library linker") then return false end
+ if not prober._probe_toolpath(configs, "sc", "xcrun -sdk iphoneos ", "swiftc", "the swift compiler") then return false end
if not prober._probe_toolpath(configs, "lipo", "xcrun -sdk iphoneos ", "lipo", "the universal files creater") then return false end
return true
end
diff --git a/xmake/scripts/platform/iphonesimulator/iphonesimulator.lua b/xmake/scripts/platform/iphonesimulator/iphonesimulator.lua
index 3765fbe85..c550a2f97 100644
--- a/xmake/scripts/platform/iphonesimulator/iphonesimulator.lua
+++ b/xmake/scripts/platform/iphonesimulator/iphonesimulator.lua
@@ -56,6 +56,7 @@ function iphonesimulator.make(configs)
configs.tools.ar = config.get("ar")
configs.tools.sh = config.get("sh")
configs.tools.ex = config.get("ar")
+ configs.tools.sc = config.get("sc")
-- init flags for architecture
local archflags = nil
diff --git a/xmake/scripts/platform/iphonesimulator/prober.lua b/xmake/scripts/platform/iphonesimulator/prober.lua
index ae9754f81..72671ecfa 100644
--- a/xmake/scripts/platform/iphonesimulator/prober.lua
+++ b/xmake/scripts/platform/iphonesimulator/prober.lua
@@ -239,6 +239,7 @@ function prober._probe_toolchains(configs)
if not prober._probe_toolpath(configs, "ld", "xcrun -sdk iphonesimulator ", "clang++", "the linker") then return false end
if not prober._probe_toolpath(configs, "ar", "xcrun -sdk iphonesimulator ", "ar", "the static library linker") then return false end
if not prober._probe_toolpath(configs, "sh", "xcrun -sdk iphonesimulator ", "clang++", "the shared library linker") then return false end
+ if not prober._probe_toolpath(configs, "sc", "xcrun -sdk iphonesimulator ", "swiftc", "the swift compiler") then return false end
return true
end
diff --git a/xmake/scripts/platform/macosx/macosx.lua b/xmake/scripts/platform/macosx/macosx.lua
index c7f4eb2c4..699e3e506 100644
--- a/xmake/scripts/platform/macosx/macosx.lua
+++ b/xmake/scripts/platform/macosx/macosx.lua
@@ -56,6 +56,7 @@ function macosx.make(configs)
configs.tools.ar = config.get("ar")
configs.tools.sh = config.get("sh")
configs.tools.ex = config.get("ar")
+ configs.tools.sc = config.get("sc")
-- init flags for architecture
local archflags = nil
@@ -97,6 +98,9 @@ function macosx.menu(action)
, {nil, "mxflags", "kv", nil, "The Objc/c++ Compiler Flags" }
, {nil, "mxxflags", "kv", nil, "The Objc++ Compiler Flags" }
, {}
+ , {nil, "sc", "kv", nil, "The Swift Compiler" }
+ , {nil, "scflags", "kv", nil, "The Swift Compiler Flags" }
+ , {}
, {nil, "xcode_dir", "kv", "auto", "The Xcode Application Directory" }
, {nil, "xcode_sdkver", "kv", "auto", "The SDK Version for Xcode" }
, }
diff --git a/xmake/scripts/platform/macosx/prober.lua b/xmake/scripts/platform/macosx/prober.lua
index d2c397edc..cc4ac3dfb 100644
--- a/xmake/scripts/platform/macosx/prober.lua
+++ b/xmake/scripts/platform/macosx/prober.lua
@@ -239,6 +239,7 @@ function prober._probe_toolchains(configs)
if not prober._probe_toolpath(configs, "ld", "xcrun -sdk macosx ", "clang++", "the linker") then return false end
if not prober._probe_toolpath(configs, "ar", "xcrun -sdk macosx ", "ar", "the static library linker") then return false end
if not prober._probe_toolpath(configs, "sh", "xcrun -sdk macosx ", "clang++", "the shared library linker") then return false end
+ if not prober._probe_toolpath(configs, "sc", "xcrun -sdk macosx ", "swiftc", "the swift compiler") then return false end
return true
end