summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Swain <robert.swain@ericsson.com>2015-09-14 22:19:19 +0200
committerEdward Hervey <bilboed@bilboed.com>2015-09-28 14:23:23 +0200
commit02866ec37764935990e7bbf070d21dabaf9179b2 (patch)
tree429d0ba3591ac9e06ef19ef99be36fee03904b1b
parent03dd484e1f85ceb534264ef77249a9a5bd091a97 (diff)
Add iOS 9.0 support
-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 d7e23a3a..b8a6f2f5 100644
--- a/cerbero/enums.py
+++ b/cerbero/enums.py
@@ -102,6 +102,7 @@ class DistroVersion:
IOS_8_2 = 'ios_8_2'
IOS_8_3 = 'ios_8_3'
IOS_8_4 = 'ios_8_4'
+ IOS_9_0 = 'ios_9_0'
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 8af08844..39281973 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_8_4, '8.4'),
+for d,v in [(DistroVersion.IOS_9_0, '9.0'),
+ (DistroVersion.IOS_8_4, '8.4'),
(DistroVersion.IOS_8_3, '8.3'),
(DistroVersion.IOS_8_2, '8.2'),
(DistroVersion.IOS_8_1, '8.1'),
@@ -79,7 +80,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]:
+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]:
os.environ['CC']= 'clang'
os.environ['CXX']= 'clang++'
extra_cflags += ' -Wno-error=format-nonliteral -Wno-error=implicit-function-declaration '