diff options
| author | ruki <[email protected]> | 2015-12-08 22:55:42 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2015-12-08 22:55:42 +0800 |
| commit | 112ec474d12b4e97044978aafef36378a9ee717f (patch) | |
| tree | d254864a3c938420730ecfe808cc8abbdb6d57ff | |
| parent | 705aaa9634a559d0877c6fcb8dd7c4c358525afc (diff) | |
fix swift and iphonesimulator bug
| -rw-r--r-- | xmake/scripts/platform/iphoneos/iphoneos.lua | 6 | ||||
| -rw-r--r-- | xmake/scripts/platform/iphonesimulator/iphonesimulator.lua | 8 | ||||
| -rw-r--r-- | xmake/scripts/platform/macosx/macosx.lua | 12 |
3 files changed, 17 insertions, 9 deletions
diff --git a/xmake/scripts/platform/iphoneos/iphoneos.lua b/xmake/scripts/platform/iphoneos/iphoneos.lua index 291f99db2..0dbd891a8 100644 --- a/xmake/scripts/platform/iphoneos/iphoneos.lua +++ b/xmake/scripts/platform/iphoneos/iphoneos.lua @@ -68,9 +68,9 @@ function iphoneos.make(configs) local archflags = nil local arch = config.get("arch") if arch then archflags = "-arch " .. arch end - configs.cxflags = { archflags } - configs.mxflags = { archflags } - configs.asflags = { archflags } + configs.cxflags = { archflags, "-mios-simulator-version-min=" .. target_minver } + configs.mxflags = { archflags, "-mios-simulator-version-min=" .. target_minver } + configs.asflags = { archflags, "-mios-simulator-version-min=" .. target_minver } configs.ldflags = { archflags, "-ObjC", "-lstdc++", "-fobjc-link-runtime", "-miphoneos-version-min=" .. target_minver } configs.shflags = { archflags, "-ObjC", "-lstdc++", "-fobjc-link-runtime", "-miphoneos-version-min=" .. target_minver } if arch then diff --git a/xmake/scripts/platform/iphonesimulator/iphonesimulator.lua b/xmake/scripts/platform/iphonesimulator/iphonesimulator.lua index cb3d8e11f..64e6dbdc8 100644 --- a/xmake/scripts/platform/iphonesimulator/iphonesimulator.lua +++ b/xmake/scripts/platform/iphonesimulator/iphonesimulator.lua @@ -66,12 +66,12 @@ function iphonesimulator.make(configs) local archflags = nil local arch = config.get("arch") if arch then archflags = "-arch " .. arch end - configs.cxflags = { archflags } - configs.mxflags = { archflags } - configs.asflags = { archflags } + configs.cxflags = { archflags, "-mios-simulator-version-min=" .. target_minver } + configs.mxflags = { archflags, "-mios-simulator-version-min=" .. target_minver } + configs.asflags = { archflags, "-mios-simulator-version-min=" .. target_minver } configs.ldflags = { archflags, "-Xlinker -objc_abi_version", "-Xlinker 2 -stdlib=libc++", "-Xlinker -no_implicit_dylibs", "-fobjc-link-runtime", "-mios-simulator-version-min=" .. target_minver } configs.shflags = { archflags, "-Xlinker -objc_abi_version", "-Xlinker 2 -stdlib=libc++", "-Xlinker -no_implicit_dylibs", "-fobjc-link-runtime", "-mios-simulator-version-min=" .. target_minver } - if arch then + if arch then configs.scflags = { string.format("-target %s-apple-ios%s", arch, target_minver) } end diff --git a/xmake/scripts/platform/macosx/macosx.lua b/xmake/scripts/platform/macosx/macosx.lua index c9abe498e..fd96d323b 100644 --- a/xmake/scripts/platform/macosx/macosx.lua +++ b/xmake/scripts/platform/macosx/macosx.lua @@ -93,9 +93,17 @@ function macosx.make(configs) config.set("__swift_linkdirs", xcode_dir .. "/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/macosx") end - -- init linkdirs and includedirs + -- init linkdirs configs.linkdirs = {"/usr/lib", "/usr/local/lib"} - configs.includedirs = {"/usr/include", "/usr/local/include"} + + -- init includedirs + -- + -- @note + -- cannot use configs.includedirs because the swift compiler will compile code failed + table.insert(configs.cxflags, "-I/usr/include") + table.insert(configs.cxflags, "-I/usr/local/include") + table.insert(configs.mxflags, "-I/usr/include") + table.insert(configs.mxflags, "-I/usr/local/include") end |