Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #7 from github/arm64

arm64 support
  • Loading branch information...
commit fc7ecaf3164b36ae3b2d58eb481a4e12e18810bf 2 parents 3ab65d1 + fab2582
@alanjrogers alanjrogers authored
Showing with 16 additions and 16 deletions.
  1. +9 −6 Expecta.xcodeproj/project.pbxproj
  2. +7 −10 src/ExpectaSupport.m
View
15 Expecta.xcodeproj/project.pbxproj
@@ -1002,12 +1002,13 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+ ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
DSTROOT = /tmp/Expecta_iOS.dst;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "src/Expecta-Prefix.pch";
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
+ ONLY_ACTIVE_ARCH = NO;
PRIVATE_HEADERS_FOLDER_PATH = "";
PRODUCT_NAME = "$(TARGET_NAME)";
PUBLIC_HEADERS_FOLDER_PATH = "";
@@ -1042,7 +1043,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+ ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(DEVELOPER_LIBRARY_DIR)/Frameworks",
@@ -1068,11 +1069,12 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+ ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
DSTROOT = /tmp/Expecta_iOS.dst;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "src/Expecta-Prefix.pch";
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
+ ONLY_ACTIVE_ARCH = NO;
PRIVATE_HEADERS_FOLDER_PATH = "";
PRODUCT_NAME = "$(TARGET_NAME)";
PUBLIC_HEADERS_FOLDER_PATH = "";
@@ -1085,11 +1087,12 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+ ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
DSTROOT = /tmp/Expecta_iOS.dst;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "src/Expecta-Prefix.pch";
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
+ ONLY_ACTIVE_ARCH = NO;
PRIVATE_HEADERS_FOLDER_PATH = "";
PRODUCT_NAME = "$(TARGET_NAME)";
PUBLIC_HEADERS_FOLDER_PATH = "";
@@ -1102,7 +1105,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+ ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(DEVELOPER_LIBRARY_DIR)/Frameworks",
@@ -1128,7 +1131,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+ ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(DEVELOPER_LIBRARY_DIR)/Frameworks",
View
17 src/ExpectaSupport.m
@@ -119,16 +119,13 @@ void EXPFail(id testCase, int lineNumber, const char *fileName, NSString *messag
NSString *EXPDescribeObject(id obj) {
if(obj == nil) {
return @"nil/null";
- } else if([obj isKindOfClass:[NSValue class]]) {
- if([obj isKindOfClass:[NSValue class]] && ![obj isKindOfClass:[NSNumber class]]) {
- void *pointerValue = [obj pointerValue];
- const char *type = [(NSValue *)obj _EXP_objCType];
- if(type) {
- if(strcmp(type, @encode(SEL)) == 0) {
- return [NSString stringWithFormat:@"@selector(%@)", NSStringFromSelector([obj pointerValue])];
- } else if(strcmp(type, @encode(Class)) == 0) {
- return NSStringFromClass(pointerValue);
- }
+ } else if([obj isKindOfClass:[NSValue class]] && ![obj isKindOfClass:[NSNumber class]]) {
+ const char *type = [(NSValue *)obj _EXP_objCType];
+ if(type) {
+ if(strcmp(type, @encode(SEL)) == 0) {
+ return [NSString stringWithFormat:@"@selector(%@)", NSStringFromSelector([obj pointerValue])];
+ } else if(strcmp(type, @encode(Class)) == 0) {
+ return NSStringFromClass([obj pointerValue]);
}
}
}
Please sign in to comment.
Something went wrong with that request. Please try again.