update -ext

Author: s1ddok

cocos2d-ext/CCBReader/CCAnimationManager.m

@@ -31,7 +31,7 @@
 #import "CCBKeyframe.h"
 #import <objc/runtime.h>
 
-#import "CCDirector_Private.h"
+#import "CCDirector.h"
 #import "CCBReader_Private.h"
 #import "CCActionManager.h"
 
@@ -248,7 +248,7 @@ - (CCActionInterval*)actionFromKeyframe0:(CCBKeyframe*)kf0 andKeyframe1:(CCBKeyf
         }
     }
 #endif
-    } else {
+    else {
         CCLOG(@"CCBReader: Failed to create animation for property: %@", name);
     }
 

cocos2d-ext/CCBReader/CCBReader.m

@@ -33,9 +33,11 @@
 #import "CCBKeyframe.h"
 #import "CCBLocalizationManager.h"
 #import "CCBReader_Private.h"
-#import "CCNode_Private.h"
-#import "CCDirector_Private.h"
+#import "CCNode.h"
+#import "CCDirector.h"
+#if CC_PHYSICS
 #import "CCPhysics+ObjectiveChipmunk.h"
+#endif
 #import "CCAnimationManager_Private.h"
 #if CC_EFFECTS
 #import "CCEffectStack.h"
@@ -1165,6 +1167,7 @@ -(void)postDeserialization
 	}
 }
 
+#if CC_PHYSICS
 -(void)readJoints
 {
     int numJoints = readIntWithSign(self, NO);
@@ -1175,10 +1178,8 @@ -(void)readJoints
     }
 }
 
-
 -(void)readJoint
 {
-    
     CCPhysicsJoint * joint = nil;
     NSString* className = [self readCachedString];
 
@@ -1320,7 +1321,7 @@ -(void)readJoint
     [joint resetScale:NodeToPhysicsScale(nodeBodyA).x];
 
 }
-
+#endif
 -(CCNode*) nodeFromClassName:(NSString*)nodeClassName
 {
     Class nodeClass = NSClassFromString(nodeClassName);
@@ -1521,6 +1522,7 @@ - (CCNode*) readNodeGraphParent:(CCNode*)parent
 
     animatedProps = NULL;
 
+#if CC_PHYSICS
     // Read physics
     BOOL hasPhysicsBody = readBool(self);
     if (hasPhysicsBody)
@@ -1645,7 +1647,7 @@ - (CCNode*) readNodeGraphParent:(CCNode*)parent
 //#endif
 
     }
-    
+#endif
     // Read and add children
     int numChildren = readIntWithSign(self, NO);
     for (int i = 0; i < numChildren; i++)
@@ -1809,7 +1811,10 @@ - (CCNode*) readFileWithCleanUp:(BOOL)cleanUp actionManagers:(NSMutableDictionar
     actionManagers = am;
 
     CCNode* node = [self readNodeGraphParent:NULL];
+    
+#if CC_PHYSICS
     [self readJoints];
+#endif
 	[self postDeserialization];
 
     [actionManagers setObject:self.animationManager forKey:[NSValue valueWithPointer:(__bridge const void *)(node)]];

cocos2d-ext/CCChipmunkPhysics/CCPhysicsBody.m

@@ -27,7 +27,7 @@
 
 #import "CCPhysicsBody.h"
 #import "CCPhysics+ObjectiveChipmunk.h"
-#import "CCNode_Private.h"
+#import "CCNode.h"
 
 
 @interface CCNode(Private)

cocos2d-ext/CCChipmunkPhysics/CCPhysicsJoint.m

@@ -24,7 +24,7 @@
 
 #import "CCPhysicsJoint.h"
 #import "CCPhysics+ObjectiveChipmunk.h"
-#import "CCNode_Private.h"
+#import "CCNode.h"
 
 @interface CCNode(Private)
 -(CGAffineTransform)nonRigidTransform;