mirror of https://github.com/axmolengine/axmol.git
Fixing compilation errors for linux.
This commit is contained in:
parent
80e863097c
commit
e5ef579cb3
|
@ -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) {
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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 \
|
||||
|
|
Loading…
Reference in New Issue