summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config/cross-ios-arm7.cbc1
-rw-r--r--config/cross-ios-x86.cbc1
-rw-r--r--config/ios.config6
3 files changed, 6 insertions, 2 deletions
diff --git a/config/cross-ios-arm7.cbc b/config/cross-ios-arm7.cbc
index bef5d1e..b29ddc4 100644
--- a/config/cross-ios-arm7.cbc
+++ b/config/cross-ios-arm7.cbc
@@ -5,4 +5,3 @@ target_arch=Architecture.ARMv7
target_distro=Distro.IOS
target_distro_version=DistroVersion.IOS_6_1
host='arm-apple-darwin'
-ios_platform='iPhoneOS'
diff --git a/config/cross-ios-x86.cbc b/config/cross-ios-x86.cbc
index 98963af..3a79a1f 100644
--- a/config/cross-ios-x86.cbc
+++ b/config/cross-ios-x86.cbc
@@ -5,4 +5,3 @@ target_arch=Architecture.X86
target_distro=Distro.IOS
target_distro_version=DistroVersion.IOS_6_1
host='i386-apple-darwin'
-ios_platform='iPhoneSimulator'
diff --git a/config/ios.config b/config/ios.config
index 9bbc496..cc2e507 100644
--- a/config/ios.config
+++ b/config/ios.config
@@ -20,6 +20,12 @@ elif target_distro_version == DistroVersion.IOS_6_1:
else:
raise FatalError("Distro version %s not supported" %(target_distro_version))
+if not ios_platform:
+ if target_arch == Architecture.X86:
+ ios_platform = 'iPhoneSimulator'
+ else:
+ ios_platform = 'iPhoneOS'
+
# For Xcode >= 4.3, the SDK is installed in a completely different path
# FIXME This has not been tested, we should check what is the iOS toolchain path
# for xcode 4.3