Changed the demo to use cocoapods for cocos2d.

Author: kstenerud

.gitignore

@@ -21,3 +21,5 @@ Thumbs.db
 *.orig
 *.xccheckout
 doxygen.config
+Pods
+Podfile.lock

ObjectAL.xcworkspace/contents.xcworkspacedata

@@ -360,7 +360,7 @@
 			children = (
 				CBBAB316171D0B84009B955F /* Supporting Files */,
 			);
-			path = "iOS";
+			path = iOS;
 			sourceTree = "<group>";
 		};
 		CBBAB316171D0B84009B955F /* Supporting Files */ = {
@@ -386,7 +386,7 @@
 			children = (
 				CBBAB345171D0BC4009B955F /* Supporting Files */,
 			);
-			path = "OSX";
+			path = OSX;
 			sourceTree = "<group>";
 		};
 		CBBAB345171D0BC4009B955F /* Supporting Files */ = {
@@ -893,7 +893,10 @@
 				DSTROOT = /tmp/ObjectAL__iOS_.dst;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "iOS/ObjectAL (iOS)-Prefix.pch";
-				OTHER_LDFLAGS = "-ObjC";
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					"-ObjC",
+				);
 				PRODUCT_NAME = ObjectAL;
 				PUBLIC_HEADERS_FOLDER_PATH = "include/$(PRODUCT_NAME)";
 				SKIP_INSTALL = YES;
@@ -906,7 +909,10 @@
 				DSTROOT = /tmp/ObjectAL__iOS_.dst;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "iOS/ObjectAL (iOS)-Prefix.pch";
-				OTHER_LDFLAGS = "-ObjC";
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					"-ObjC",
+				);
 				PRODUCT_NAME = ObjectAL;
 				PUBLIC_HEADERS_FOLDER_PATH = "include/$(PRODUCT_NAME)";
 				SKIP_INSTALL = YES;

ObjectAL/ObjectAL.xcodeproj/project.pbxproj

@@ -8,7 +8,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#import "cocos2d.h"
+#import <cocos2d/cocos2d.h>
 
 int main(int argc, char *argv[])
 {

ObjectALDemo/OALDemo (OSX)/main.m

@@ -6,7 +6,7 @@
 //  Copyright Karl Stenerud 2013. All rights reserved.
 //
 
-#import "cocos2d.h"
+#import <cocos2d/cocos2d.h>
 
 #import "AppDelegate.h"
 #import "IntroLayer.h"

ObjectALDemo/OALDemo (iOS)/AppDelegate.m

@@ -11,7 +11,7 @@
 #import "ImageButton.h"
 #import "MainLayer.h"
 #import "CCLayer+Scene.h"
-#import <ObjectAL/OALTools.h>
+#import <ObjectAL/Support/OALTools.h>
 
 #define MAX_RANDOM_REPEATS 2
 

ObjectALDemo/OALDemo (iOS)/Demos/SourceNotificationsDemo.m

@@ -8,7 +8,7 @@
 
 
 // When you import this file, you import all the cocos2d classes
-#import "cocos2d.h"
+#import <cocos2d/cocos2d.h>
 
 // HelloWorldLayer
 @interface IntroLayer : CCLayer

ObjectALDemo/OALDemo (iOS)/IntroLayer.h

@@ -17,7 +17,7 @@ - (void) setContentSizeFromChildren
 	float maxX = -1000000;
 	float maxY = -1000000;
 
-	for(CCNode* node in children_)
+	for(CCNode* node in _children)
 	{
 		float nextMinX = node.position.x - node.contentSize.width * node.scaleX * node.anchorPoint.x;
 		float nextMaxX = nextMinX + node.contentSize.width * node.scaleX;
@@ -49,7 +49,7 @@ - (CGSize) minimalDimensionsForChildren
 {
 	CGSize size = CGSizeMake(0, 0);
 
-	for(CCNode* node in children_)
+	for(CCNode* node in _children)
 	{
 		if(node.contentSize.width * node.scaleX > size.width)
 		{

ObjectALDemo/OALDemo (iOS)/Support/CCNode+ContentSize.m

@@ -62,11 +62,11 @@ -(void) execute
 {
 	if(twoObjects)
 	{
-		[targetCallback_ performSelector:selector_ withObject:object withObject:object2];
+		[_targetCallback performSelector:_selector withObject:object withObject:object2];
 	}
 	else
 	{
-		[targetCallback_ performSelector:selector_ withObject:object];
+		[_targetCallback performSelector:_selector withObject:object];
 	}
 }
 

ObjectALDemo/OALDemo (iOS)/Support/CallFuncWithObject.m

@@ -12,7 +12,7 @@
  */
 @interface TouchableNode : CCNode
 #ifdef __CC_PLATFORM_IOS
-    <CCStandardTouchDelegate, CCTargetedTouchDelegate>
+    <CCTouchOneByOneDelegate, CCTouchAllAtOnceDelegate>
 #elif defined(__CC_PLATFORM_MAC)
     <CCKeyboardEventDelegate, CCMouseEventDelegate, CCTouchEventDelegate>
 #endif