diff options
| author | ruki <[email protected]> | 2015-12-08 11:30:50 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2015-12-08 11:30:50 +0800 |
| commit | 476fc44034424eca377d42b4adf97e7e8c490735 (patch) | |
| tree | 3d43bc252074bd2ac785277df55ed4316017439c /xmake/scripts | |
| parent | 75a2bc862eae7ed95ddee16e4271b773c95aeb65 (diff) | |
add swift target
Diffstat (limited to 'xmake/scripts')
| -rw-r--r-- | xmake/scripts/platform/iphoneos/iphoneos.lua | 7 | ||||
| -rw-r--r-- | xmake/scripts/platform/iphonesimulator/iphonesimulator.lua | 9 | ||||
| -rw-r--r-- | xmake/scripts/platform/macosx/macosx.lua | 7 |
3 files changed, 16 insertions, 7 deletions
diff --git a/xmake/scripts/platform/iphoneos/iphoneos.lua b/xmake/scripts/platform/iphoneos/iphoneos.lua index 282d3fe52..9c0d3e88f 100644 --- a/xmake/scripts/platform/iphoneos/iphoneos.lua +++ b/xmake/scripts/platform/iphoneos/iphoneos.lua @@ -67,8 +67,11 @@ function iphoneos.make(configs) configs.cxflags = { archflags } configs.mxflags = { archflags } configs.asflags = { archflags } - configs.ldflags = { archflags, "-ObjC", "-lstdc++", "-fobjc-link-runtime", "-miphoneos-version-min=6.0" } - configs.shflags = { archflags, "-ObjC", "-lstdc++", "-fobjc-link-runtime", "-miphoneos-version-min=6.0" } + configs.ldflags = { archflags, "-ObjC", "-lstdc++", "-fobjc-link-runtime", "-miphoneos-version-min=7.0" } + configs.shflags = { archflags, "-ObjC", "-lstdc++", "-fobjc-link-runtime", "-miphoneos-version-min=7.0" } + if arch then + configs.scflags = { string.format("-target %s-apple-ios7", arch) } + end -- init flags for the xcode sdk directory local xcode_dir = config.get("xcode_dir") diff --git a/xmake/scripts/platform/iphonesimulator/iphonesimulator.lua b/xmake/scripts/platform/iphonesimulator/iphonesimulator.lua index c550a2f97..dc2b6734d 100644 --- a/xmake/scripts/platform/iphonesimulator/iphonesimulator.lua +++ b/xmake/scripts/platform/iphonesimulator/iphonesimulator.lua @@ -65,9 +65,12 @@ function iphonesimulator.make(configs) configs.cxflags = { archflags } configs.mxflags = { archflags } configs.asflags = { archflags } - configs.ldflags = { archflags, "-Xlinker -objc_abi_version", "-Xlinker 2 -stdlib=libc++", "-Xlinker -no_implicit_dylibs", "-fobjc-link-runtime", "-mios-simulator-version-min=5.0" } - configs.shflags = { archflags, "-Xlinker -objc_abi_version", "-Xlinker 2 -stdlib=libc++", "-Xlinker -no_implicit_dylibs", "-fobjc-link-runtime", "-mios-simulator-version-min=5.0" } - + configs.ldflags = { archflags, "-Xlinker -objc_abi_version", "-Xlinker 2 -stdlib=libc++", "-Xlinker -no_implicit_dylibs", "-fobjc-link-runtime", "-mios-simulator-version-min=7.0" } + configs.shflags = { archflags, "-Xlinker -objc_abi_version", "-Xlinker 2 -stdlib=libc++", "-Xlinker -no_implicit_dylibs", "-fobjc-link-runtime", "-mios-simulator-version-min=7.0" } + if arch then + configs.scflags = { string.format("-target %s-apple-ios7", arch) } + end + -- init flags for the xcode sdk directory local xcode_dir = config.get("xcode_dir") local xcode_sdkver = config.get("xcode_sdkver") diff --git a/xmake/scripts/platform/macosx/macosx.lua b/xmake/scripts/platform/macosx/macosx.lua index 699e3e506..414efb016 100644 --- a/xmake/scripts/platform/macosx/macosx.lua +++ b/xmake/scripts/platform/macosx/macosx.lua @@ -65,8 +65,11 @@ function macosx.make(configs) configs.cxflags = { archflags, "-fpascal-strings", "-fmessage-length=0" } configs.mxflags = { archflags, "-fpascal-strings", "-fmessage-length=0" } configs.asflags = { archflags } - configs.ldflags = { archflags, "-mmacosx-version-min=10.7", "-stdlib=libc++", "-lz" } - configs.shflags = { archflags, "-mmacosx-version-min=10.7", "-stdlib=libc++", "-lz" } + configs.ldflags = { archflags, "-mmacosx-version-min=10.9", "-stdlib=libc++", "-lz" } + configs.shflags = { archflags, "-mmacosx-version-min=10.9", "-stdlib=libc++", "-lz" } + if arch then + configs.scflags = { string.format("-target %s-apple-macosx10.9", arch) } + end -- init flags for the xcode sdk directory local xcode_dir = config.get("xcode_dir") |