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

more compilations issues. 

compiles on Android
This commit is contained in:
Ricardo Quesada 2015-04-08 21:40:39 -07:00
parent 23b0d4d2f6
commit 49e2e8964e
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
View File

@ -5,8 +5,9 @@
#include "VisibleRect.h"
using namespace cocos2d;
USING_NS_CC;
using namespace cocostudio;
using namespace cocostudio::timeline;
CocoStudioActionTimelineTests::CocoStudioActionTimelineTests()
{

4
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.h
View File

@ -46,7 +46,7 @@ public:
void onTouchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
protected:
ActionTimeline* action;
cocostudio::timeline::ActionTimeline* action;
};
class TestTimelineFrameEvent : public ActionTimelineBaseTest
@ -57,7 +57,7 @@ public:
virtual void onEnter() override;
virtual std::string title() const override;
void onFrameEvent(Frame* frame);
void onFrameEvent(cocostudio::timeline::Frame* frame);
};
class TestTimelinePerformance : public ActionTimelineBaseTest