aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xiPhone/CordovaLib/CordovaLib.xcodeproj/project.pbxproj28
-rw-r--r--iPhone/FixMyStreet.xcodeproj/project.pbxproj10
2 files changed, 18 insertions, 20 deletions
diff --git a/iPhone/CordovaLib/CordovaLib.xcodeproj/project.pbxproj b/iPhone/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
index c14f889..63ab4dd 100755
--- a/iPhone/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
+++ b/iPhone/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
@@ -589,15 +589,9 @@
isa = XCBuildConfiguration;
buildSettings = {
"ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD)";
- "ARCHS[sdk=iphoneos6.*]" = (
- armv7,
- armv7s,
- );
- "ARCHS[sdk=iphoneos7.*]" = (
- armv7,
- armv7s,
- );
- "ARCHS[sdk=iphonesimulator*]" = i386;
+ "ARCHS[sdk=iphoneos6.*]" = "$(ARCHS_STANDARD)";
+ "ARCHS[sdk=iphoneos7.*]" = "$(ARCHS_STANDARD)";
+ "ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD)";
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_EMPTY_BODY = YES;
@@ -623,7 +617,7 @@
SKIP_INSTALL = YES;
TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "";
- VALID_ARCHS = "i386 armv7 armv7s";
+ VALID_ARCHS = "arm64 armv7 armv7s";
};
name = Debug;
};
@@ -631,15 +625,9 @@
isa = XCBuildConfiguration;
buildSettings = {
"ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD)";
- "ARCHS[sdk=iphoneos6.*]" = (
- armv7,
- armv7s,
- );
- "ARCHS[sdk=iphoneos7.*]" = (
- armv7,
- armv7s,
- );
- "ARCHS[sdk=iphonesimulator*]" = i386;
+ "ARCHS[sdk=iphoneos6.*]" = "$(ARCHS_STANDARD)";
+ "ARCHS[sdk=iphoneos7.*]" = "$(ARCHS_STANDARD)";
+ "ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD)";
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_EMPTY_BODY = YES;
@@ -663,7 +651,7 @@
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
TARGETED_DEVICE_FAMILY = "1,2";
- VALID_ARCHS = "i386 armv7 armv7s";
+ VALID_ARCHS = "arm64 armv7 armv7s";
};
name = Release;
};
diff --git a/iPhone/FixMyStreet.xcodeproj/project.pbxproj b/iPhone/FixMyStreet.xcodeproj/project.pbxproj
index c4e79d0..a7838a1 100644
--- a/iPhone/FixMyStreet.xcodeproj/project.pbxproj
+++ b/iPhone/FixMyStreet.xcodeproj/project.pbxproj
@@ -504,6 +504,10 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ ARCHS = (
+ armv7,
+ armv7s,
+ );
CLANG_ENABLE_OBJC_ARC = NO;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -532,6 +536,7 @@
PROVISIONING_PROFILE = "";
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
TARGETED_DEVICE_FAMILY = 1;
+ VALID_ARCHS = "armv7 armv7s";
};
name = Debug;
};
@@ -539,6 +544,10 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ ARCHS = (
+ armv7,
+ armv7s,
+ );
CLANG_ENABLE_OBJC_ARC = NO;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
@@ -565,6 +574,7 @@
PROVISIONING_PROFILE = "";
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
TARGETED_DEVICE_FAMILY = 1;
+ VALID_ARCHS = "armv7 armv7s";
};
name = Release;
};