diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2013-01-31 13:32:31 +0100 |
|---|---|---|
| committer | Andoni Morales Alastruey <ylatuya@gmail.com> | 2013-02-22 22:22:39 +0100 |
| commit | 2aa5c7c703d3745c813a9493b55c581d195655a6 (patch) | |
| tree | c583b65bb6f578e0d561b48c79a64da2525fc54d /config | |
| parent | 5dbecff03922ef0ee326e8a8dbc5dc1b313a1459 (diff) | |
Don't override platform in the iOS configs
Diffstat (limited to 'config')
| -rw-r--r-- | config/cross-ios-arm7.cbc | 2 | ||||
| -rw-r--r-- | config/cross-ios-x86.cbc | 2 | ||||
| -rw-r--r-- | config/ios.config | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/config/cross-ios-arm7.cbc b/config/cross-ios-arm7.cbc index 93f1d76e..433e074b 100644 --- a/config/cross-ios-arm7.cbc +++ b/config/cross-ios-arm7.cbc @@ -5,4 +5,4 @@ target_arch=Architecture.ARMv7 target_distro=Distro.IOS target_distro_version=DistroVersion.IOS_6_0 host='arm-apple-darwin' -platform='iPhoneOS' +ios_platform='iPhoneOS' diff --git a/config/cross-ios-x86.cbc b/config/cross-ios-x86.cbc index 5b31f9bb..8f3742b0 100644 --- a/config/cross-ios-x86.cbc +++ b/config/cross-ios-x86.cbc @@ -5,4 +5,4 @@ target_arch=Architecture.X86 target_distro=Distro.IOS target_distro_version=DistroVersion.IOS_6_0 host='i386-apple-darwin' -platform='iPhoneSimulator' +ios_platform='iPhoneSimulator' diff --git a/config/ios.config b/config/ios.config index 754a3760..f3e6b1e7 100644 --- a/config/ios.config +++ b/config/ios.config @@ -24,8 +24,8 @@ else: # for xcode 4.3 sysroot = '/Developer/SDKs/%s%s.sdk' % (platform, v) if not os.path.exists(sysroot): - iphone_platform = '/Applications/Xcode.app/Contents/Developer/Platforms/%s.platform/Developer' %platform - sysroot = os.path.join(iphone_platform, 'SDKs', '%s%s.sdk' %(platform, v)) + iphone_platform = '/Applications/Xcode.app/Contents/Developer/Platforms/%s.platform/Developer' % ios_platform + sysroot = os.path.join(iphone_platform, 'SDKs', '%s%s.sdk' %(ios_platform, v)) ccache = use_ccache and 'ccache ' or '' extra_cflags='' @@ -52,7 +52,7 @@ os.environ['CXXPP']= os.environ['CPP'] os.environ['CXXFLAGS'] = os.environ['CFLAGS'] -if platform == "iPhoneOS": +if ios_platform == "iPhoneOS": simulator_headers = '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator%s.sdk/usr/include' % v for missing_header in ["bzlib.h", "crt_externs.h"]: missing_path = os.path.join(sysroot, "usr", "include", missing_header) |