Updated Branches: refs/heads/master cf2412b5a -> 07b54f149
[CB-1360] Conditionally add architectures based on iOS version in CordovaLib Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/commit/07b54f14 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/tree/07b54f14 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/diff/07b54f14 Branch: refs/heads/master Commit: 07b54f14951af57906a25f041f8c1ccb497006e9 Parents: cf2412b Author: Shazron Abdullah <shaz...@apache.org> Authored: Tue Sep 18 17:40:03 2012 -0700 Committer: Shazron Abdullah <shaz...@apache.org> Committed: Tue Sep 18 17:40:03 2012 -0700 ---------------------------------------------------------------------- CordovaLib/CordovaLib.xcodeproj/project.pbxproj | 32 ++++++++++++++--- 1 files changed, 26 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/07b54f14/CordovaLib/CordovaLib.xcodeproj/project.pbxproj ---------------------------------------------------------------------- diff --git a/CordovaLib/CordovaLib.xcodeproj/project.pbxproj b/CordovaLib/CordovaLib.xcodeproj/project.pbxproj index ec0d0fe..fad66de 100644 --- a/CordovaLib/CordovaLib.xcodeproj/project.pbxproj +++ b/CordovaLib/CordovaLib.xcodeproj/project.pbxproj @@ -488,10 +488,15 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = ( + "ARCHS[sdk=iphoneos*]" = ( armv6, armv7, ); + "ARCHS[sdk=iphoneos6.*]" = ( + armv7, + armv7s, + ); + "ARCHS[sdk=iphonesimulator*]" = i386; CLANG_ENABLE_OBJC_ARC = YES; COPY_PHASE_STRIP = NO; DSTROOT = "/tmp/$(PROJECT_NAME).dst"; @@ -515,10 +520,15 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = ( + "ARCHS[sdk=iphoneos*]" = ( armv6, armv7, ); + "ARCHS[sdk=iphoneos6.*]" = ( + armv7, + armv7s, + ); + "ARCHS[sdk=iphonesimulator*]" = i386; CLANG_ENABLE_OBJC_ARC = YES; DSTROOT = "/tmp/$(PROJECT_NAME).dst"; GCC_MODEL_TUNING = G5; @@ -538,10 +548,15 @@ 1DEB922308733DC00010E9CD /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( + "ARCHS[sdk=iphoneos*]" = ( armv6, armv7, ); + "ARCHS[sdk=iphoneos6.*]" = ( + armv7, + armv7s, + ); + "ARCHS[sdk=iphonesimulator*]" = i386; GCC_C_LANGUAGE_STANDARD = c99; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ""; @@ -557,17 +572,22 @@ SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = "1,2"; USER_HEADER_SEARCH_PATHS = ""; - VALID_ARCHS = "i386 armv6 armv7"; + VALID_ARCHS = "i386 armv6 armv7 armv7s"; }; name = Debug; }; 1DEB922408733DC00010E9CD /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( + "ARCHS[sdk=iphoneos*]" = ( armv6, armv7, ); + "ARCHS[sdk=iphoneos6.*]" = ( + armv7, + armv7s, + ); + "ARCHS[sdk=iphonesimulator*]" = i386; GCC_C_LANGUAGE_STANDARD = c99; GCC_PREPROCESSOR_DEFINITIONS = ""; GCC_THUMB_SUPPORT = NO; @@ -580,7 +600,7 @@ SDKROOT = iphoneos; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = "1,2"; - VALID_ARCHS = "i386 armv6 armv7"; + VALID_ARCHS = "i386 armv6 armv7 armv7s"; }; name = Release; };
