Merge pull request #2216 from dumganhar/master

Fixing compilation errors for linux.

extensions/CCBReader/CCBAnimationManager.cpp

@@ -23,10 +23,10 @@ CCBAnimationManager::CCBAnimationManager()
 , mAutoPlaySequenceId(0)
 , mRootNode(NULL)
 , mRootContainerSize(CCSizeZero)
-, mOwner(NULL)
-, jsControlled(false)
 , mDelegate(NULL)
 , mRunningSequence(NULL)
+, jsControlled(false)
+, mOwner(NULL)
 {
     init();
 }
@@ -585,7 +585,7 @@ CCObject* CCBAnimationManager::actionForCallbackChannel(CCBSequenceProperty* cha
                 actions->addObject(callback);
             }
         } else {
-            CCObject *target;
+            CCObject* target = NULL;
             if(selectorTarget == kCCBTargetTypeDocumentRoot) target = mRootNode;
             else if (selectorTarget == kCCBTargetTypeOwner) target = mOwner;
             if(target != NULL) {

extensions/CCBReader/CCNodeLoader.cpp

@@ -163,6 +163,7 @@ void CCNodeLoader::parseProperties(CCNode * pNode, CCNode * pParent, CCBReader *
                 {
                     this->onHandlePropTypeFloatXY(pNode, pParent, propertyName.c_str(), xy, pCCBReader);
                 }
+                CC_SAFE_DELETE_ARRAY(xy);
                 break;
 	      }
 
@@ -451,8 +452,6 @@ float * CCNodeLoader::parsePropTypeFloatXY(CCNode * pNode, CCNode * pParent, CCB
     float x = pCCBReader->readFloat();
     float y = pCCBReader->readFloat();
 
-    int type = pCCBReader->readInt(false);
-
     float * floatXY = new float[2];
     floatXY[0] = x;
     floatXY[1] = y;

extensions/proj.linux/Makefile

@@ -4,6 +4,7 @@ COCOS_ROOT=../..
 
 INCLUDES = -I$(COCOS_ROOT)/external \
 	-I$(COCOS_ROOT)/external/chipmunk/include/chipmunk \
+	-I$(COCOS_ROOT)/CocosDenshion/include \
 	-I.. \
 	-I../CCBReader \
 	-I../GUI/CCControlExtension \