Fixes for running unit tests on 64 bit.

Former-commit-id: 3add678

Author: slembcke

Chipmunk7-ios.xcodeproj/project.pbxproj

@@ -380,7 +380,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD)";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = NO;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
@@ -406,7 +405,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD)";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = NO;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;

UnitTests/CCPhysicsTests.m

@@ -361,46 +361,50 @@ -(void)testBasicSequences11
 
 -(void)testDynamicAnchorPoint
 {
+	cpFloat accuracy = 1e-4;
+	
 	CCPhysicsNode *physicsNode = [CCPhysicsNode node];
 
 	CCNode *node = [CCNode node];
 	node.contentSize = CGSizeMake(2, 2);
 	node.anchorPoint = ccp(0.5, 0.5);
-	XCTAssert(ccpDistance(node.position, CGPointZero) == 0.0, @"");
+	XCTAssert(ccpDistance(node.position, CGPointZero) < accuracy, @"");
 
 	node.physicsBody = [CCPhysicsBody bodyWithCircleOfRadius:1.0 andCenter:CGPointZero];
 	node.physicsBody.type = CCPhysicsBodyTypeDynamic;
-	XCTAssert(ccpDistance(node.position, CGPointZero) == 0.0, @"");
+	XCTAssert(ccpDistance(node.position, CGPointZero) < accuracy, @"");
 
 	[physicsNode addChild:node];
 	[physicsNode onEnter];
-	XCTAssert(ccpDistance(node.position, CGPointZero) == 0.0, @"");
+	XCTAssert(ccpDistance(node.position, CGPointZero) < accuracy, @"");
 
 	node.rotation = 90;
-	XCTAssert(ccpDistance(node.position, CGPointZero) == 0.0, @"");
+	XCTAssert(ccpDistance(node.position, CGPointZero) < accuracy, @"");
 
 	[physicsNode onExit];
 }
 
 -(void)testStaticAnchorPoint
 {
+	cpFloat accuracy = 1e-4;
+	
 	CCPhysicsNode *physicsNode = [CCPhysicsNode node];
 
 	CCNode *node = [CCNode node];
 	node.contentSize = CGSizeMake(2, 2);
 	node.anchorPoint = ccp(0.5, 0.5);
-	XCTAssert(ccpDistance(node.position, CGPointZero) == 0.0, @"");
+	XCTAssert(ccpDistance(node.position, CGPointZero) < accuracy, @"");
 
 	node.physicsBody = [CCPhysicsBody bodyWithCircleOfRadius:1.0 andCenter:CGPointZero];
 	node.physicsBody.type = CCPhysicsBodyTypeStatic;
-	XCTAssert(ccpDistance(node.position, CGPointZero) == 0.0, @"");
+	XCTAssert(ccpDistance(node.position, CGPointZero) < accuracy, @"");
 
 	[physicsNode addChild:node];
 	[physicsNode onEnter];
-	XCTAssert(ccpDistance(node.position, CGPointZero) == 0.0, @"");
+	XCTAssert(ccpDistance(node.position, CGPointZero) < accuracy, @"");
 
 	node.rotation = 90;
-	XCTAssert(ccpDistance(node.position, CGPointZero) == 0.0, @"");
+	XCTAssert(ccpDistance(node.position, CGPointZero) < accuracy, @"");
 
 	[physicsNode onExit];
 }

cocos2d-tests-ios.xcodeproj/project.pbxproj.REMOVED.git-id

@@ -1 +1 @@
-c242ea53588adc36df5dfa4687bac683e8c60efa
+ff4a2d3466bfd917096f6f892ba450058e0d59b5

cocos2d/CCPhysicsNode.m

@@ -348,10 +348,10 @@ -(void)registerDelegateMethodsForClass:(Class)class
 			method_getReturnType(methods[i], returnType, 2);
 
 			if([phase isEqualToString:@"ccPhysicsCollisionBegin"]){
-				NSAssert(strcmp(returnType, "c") == 0, @"CCPhysicsCollisionBegin delegate methods must return a BOOL.");
+				NSAssert(strcmp(returnType, @encode(BOOL)) == 0, @"CCPhysicsCollisionBegin delegate methods must return a BOOL.");
 				[self handlerForTypeA:typeA typeB:typeB].begin = methods[i];
 			} else if([phase isEqualToString:@"ccPhysicsCollisionPreSolve"]){
-				NSAssert(strcmp(returnType, "c") == 0, @"CCPhysicsCollisionPreSolve delegate methods must return a BOOL.");
+				NSAssert(strcmp(returnType, @encode(BOOL)) == 0, @"CCPhysicsCollisionPreSolve delegate methods must return a BOOL.");
 				[self handlerForTypeA:typeA typeB:typeB].preSolve = methods[i];
 			} else if([phase isEqualToString:@"ccPhysicsCollisionPostSolve"]){
 				// TODO check for no return value?