summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2015-12-08 21:59:59 +0800
committerruki <[email protected]>2015-12-08 21:59:59 +0800
commit705aaa9634a559d0877c6fcb8dd7c4c358525afc (patch)
tree2dbeacaea853832460969352a4fcbc02dae58952
parent93a02f675be08d750d327626ac7a04741e7a9d0e (diff)
add sdk for scflags
-rw-r--r--tests/console/src/demo/demo.swift1
-rw-r--r--xmake/scripts/platform/iphoneos/iphoneos.lua1
-rw-r--r--xmake/scripts/platform/iphonesimulator/iphonesimulator.lua1
-rw-r--r--xmake/scripts/platform/macosx/macosx.lua1
4 files changed, 4 insertions, 0 deletions
diff --git a/tests/console/src/demo/demo.swift b/tests/console/src/demo/demo.swift
index 81bc4f351..ee21045f4 100644
--- a/tests/console/src/demo/demo.swift
+++ b/tests/console/src/demo/demo.swift
@@ -1,2 +1,3 @@
+import Foundation
print("hello world!")
diff --git a/xmake/scripts/platform/iphoneos/iphoneos.lua b/xmake/scripts/platform/iphoneos/iphoneos.lua
index f57d4c303..291f99db2 100644
--- a/xmake/scripts/platform/iphoneos/iphoneos.lua
+++ b/xmake/scripts/platform/iphoneos/iphoneos.lua
@@ -89,6 +89,7 @@ function iphoneos.make(configs)
table.insert(configs.mxflags, "-isysroot " .. xcode_sdkdir)
table.insert(configs.ldflags, "-isysroot " .. xcode_sdkdir)
table.insert(configs.shflags, "-isysroot " .. xcode_sdkdir)
+ table.insert(configs.scflags, "-sdk " .. xcode_sdkdir)
-- save swift link directory
config.set("__swift_linkdirs", xcode_dir .. "/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/iphoneos")
diff --git a/xmake/scripts/platform/iphonesimulator/iphonesimulator.lua b/xmake/scripts/platform/iphonesimulator/iphonesimulator.lua
index 067fccf22..cb3d8e11f 100644
--- a/xmake/scripts/platform/iphonesimulator/iphonesimulator.lua
+++ b/xmake/scripts/platform/iphonesimulator/iphonesimulator.lua
@@ -87,6 +87,7 @@ function iphonesimulator.make(configs)
table.insert(configs.mxflags, "-isysroot " .. xcode_sdkdir)
table.insert(configs.ldflags, "-isysroot " .. xcode_sdkdir)
table.insert(configs.shflags, "-isysroot " .. xcode_sdkdir)
+ table.insert(configs.scflags, "-sdk " .. xcode_sdkdir)
-- save swift link directory
config.set("__swift_linkdirs", xcode_dir .. "/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/iphonesimulator")
diff --git a/xmake/scripts/platform/macosx/macosx.lua b/xmake/scripts/platform/macosx/macosx.lua
index 11c835b3c..c9abe498e 100644
--- a/xmake/scripts/platform/macosx/macosx.lua
+++ b/xmake/scripts/platform/macosx/macosx.lua
@@ -87,6 +87,7 @@ function macosx.make(configs)
table.insert(configs.mxflags, "-isysroot " .. xcode_sdkdir)
table.insert(configs.ldflags, "-isysroot " .. xcode_sdkdir)
table.insert(configs.shflags, "-isysroot " .. xcode_sdkdir)
+ table.insert(configs.scflags, "-sdk " .. xcode_sdkdir)
-- save swift link directory
config.set("__swift_linkdirs", xcode_dir .. "/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/macosx")