Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update Android.mk

This commit is contained in:
kaile.yin 2014-11-19 10:57:22 +08:00
parent bbd971d910
commit d764c18271
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
View File

@ -814,7 +814,7 @@ Node* CSLoader::nodeFromProtocolBuffers(const protocolbuffers::NodeTree &nodetre
if(filePath != "")
{
Node* root = createNodeFromProtocolBuffers(_protocolBuffersPath + filePath);
setPropsForProjectNodeFromProtocolBuffers(node, options, nodeOptions);
setPropsForProjectNodeFromProtocolBuffers(root, options, nodeOptions);
cocostudio::timeline::ActionTimeline* action = cocostudio::timeline::ActionTimelineCache::getInstance()->createActionFromProtocolBuffers(_protocolBuffersPath + filePath);
if(action)
@ -824,6 +824,7 @@ Node* CSLoader::nodeFromProtocolBuffers(const protocolbuffers::NodeTree &nodetre
}
node = ActionTimelineNode::create(root, action);
node->setName(root->getName());
}
curOptions = nodeOptions;

1
cocos/editor-support/cocostudio/Android.mk
View File

@ -59,6 +59,7 @@ ActionTimeline/CCActionTimelineCache.cpp \
ActionTimeline/CCFrame.cpp \
ActionTimeline/CCTimeLine.cpp \
ActionTimeline/CCActionTimeline.cpp \
ActionTimeline/CCActionTimelineNode.cpp \
ActionTimeline/CSLoader.cpp \
CSParseBinary.pb.cc