diff options
| author | ruki <[email protected]> | 2015-06-24 14:24:08 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2015-06-24 14:24:08 +0800 |
| commit | d9ee17f8892ee0537b5bbc461e760b4a5cb0a763 (patch) | |
| tree | 8ae97724e5ec13011d463fbc5ed46d345da89da4 /xmake/scripts/platform/iphoneos | |
| parent | fd42ceb8e86322924d82aced97ad89accadb7592 (diff) | |
modify platform and makefile
Diffstat (limited to 'xmake/scripts/platform/iphoneos')
| -rw-r--r-- | xmake/scripts/platform/iphoneos/iphoneos.lua | 8 | ||||
| -rw-r--r-- | xmake/scripts/platform/iphoneos/prober.lua | 6 |
2 files changed, 5 insertions, 9 deletions
diff --git a/xmake/scripts/platform/iphoneos/iphoneos.lua b/xmake/scripts/platform/iphoneos/iphoneos.lua index c02513b08..8656d20cc 100644 --- a/xmake/scripts/platform/iphoneos/iphoneos.lua +++ b/xmake/scripts/platform/iphoneos/iphoneos.lua @@ -66,10 +66,12 @@ function iphoneos.make(configs) 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" } - + -- init flags for the xcode sdk directory - local xcode_sdkdir = config.get("__xcode_sdkdir") - if xcode_sdkdir then + local xcode_dir = config.get("xcode_dir") + local xcode_sdkver = config.get("xcode_sdkver") + if xcode_dir and xcode_sdkver then + local xcode_sdkdir = xcode_dir .. "/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS" .. xcode_sdkver .. ".sdk" table.insert(configs.cxflags, "-isysroot " .. xcode_sdkdir) table.insert(configs.asflags, "-isysroot " .. xcode_sdkdir) table.insert(configs.mxflags, "-isysroot " .. xcode_sdkdir) diff --git a/xmake/scripts/platform/iphoneos/prober.lua b/xmake/scripts/platform/iphoneos/prober.lua index 1d6b34f2c..3de0965de 100644 --- a/xmake/scripts/platform/iphoneos/prober.lua +++ b/xmake/scripts/platform/iphoneos/prober.lua @@ -125,12 +125,6 @@ function prober._probe_xcode_sdkver(configs) -- save it configs.set("xcode_sdkver", xcode_sdkver) - - -- save the xcode sdk directory - local xcode_dir = configs.get("xcode_dir") - if xcode_dir then - configs.set("__xcode_sdkdir", xcode_dir .. "/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS" .. xcode_sdkver .. ".sdk") - end -- trace utils.verbose("checking for the Xcode SDK version for %s ... %s", configs.get("plat"), xcode_sdkver) |