summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Hervey <bilboed@bilboed.com>2016-02-08 15:42:27 +0100
committerEdward Hervey <bilboed@bilboed.com>2016-02-08 15:42:27 +0100
commiteed11d75f6fe00c94eac79af88203b2edc444035 (patch)
treeaeba0c5b03af3bb80c0add4795e12aee098c54a0
parent6dc67b6d294d1f9628e3b126b67bf71f6d4b82d5 (diff)
ios: Add support for iOS 9.2
-rw-r--r--cerbero/enums.py1
-rw-r--r--config/ios.config5
2 files changed, 4 insertions, 2 deletions
diff --git a/cerbero/enums.py b/cerbero/enums.py
index 68c6e65b..1372cc1a 100644
--- a/cerbero/enums.py
+++ b/cerbero/enums.py
@@ -107,6 +107,7 @@ class DistroVersion:
IOS_8_4 = 'ios_8_4'
IOS_9_0 = 'ios_9_0'
IOS_9_1 = 'ios_9_1'
+ IOS_9_2 = 'ios_9_2'
ANDROID_GINGERBREAD = 'android_gingerbread' # API Level 9
ANDROID_ICE_CREAM_SANDWICH = 'android_ice_cream_sandwich' # API Level 14
ANDROID_JELLY_BEAN = 'android_jelly_bean' # API Level 16
diff --git a/config/ios.config b/config/ios.config
index cea232c9..bc16442e 100644
--- a/config/ios.config
+++ b/config/ios.config
@@ -29,7 +29,8 @@ _toolchain_root = '%s/usr/bin' % iphone_platform
# Find the installed SDK
_sdk_version = None
-for d,v in [(DistroVersion.IOS_9_1, '9.1'),
+for d,v in [(DistroVersion.IOS_9_2, '9.2'),
+ (DistroVersion.IOS_9_1, '9.1'),
(DistroVersion.IOS_9_0, '9.0'),
(DistroVersion.IOS_8_4, '8.4'),
(DistroVersion.IOS_8_3, '8.3'),
@@ -81,7 +82,7 @@ else:
# Toolchain environment
-if target_distro_version in [DistroVersion.IOS_7_0, DistroVersion.IOS_7_1, DistroVersion.IOS_8_0, DistroVersion.IOS_8_1, DistroVersion.IOS_8_2, DistroVersion.IOS_8_3, DistroVersion.IOS_8_4, DistroVersion.IOS_9_0, DistroVersion.IOS_9_1]:
+if target_distro_version in [DistroVersion.IOS_7_0, DistroVersion.IOS_7_1, DistroVersion.IOS_8_0, DistroVersion.IOS_8_1, DistroVersion.IOS_8_2, DistroVersion.IOS_8_3, DistroVersion.IOS_8_4, DistroVersion.IOS_9_0, DistroVersion.IOS_9_1, DistroVersion.IOS_9_2]:
os.environ['CC']= 'clang'
os.environ['CXX']= 'clang++'
extra_cflags += ' -Wno-error=format-nonliteral -Wno-error=implicit-function-declaration '