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

Moves CCConsole.* to base/

This commit is contained in:
Ricardo Quesada 2013-12-04 18:09:23 -08:00
parent c2a88154af
commit f42aef0af8
5 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +1 @@
dfa173be6dd2c75b38aa6a33c6e53d9d013bd1d4 952fb6950a128b17bdd2a4ffb998c22319a95bf0

2
cocos/2d/cocos2d.h
View File

@ -199,7 +199,7 @@ THE SOFTWARE.
#include "ccUTF8.h" #include "ccUTF8.h"
#include "CCNotificationCenter.h" #include "CCNotificationCenter.h"
#include "CCProfiling.h" #include "CCProfiling.h"
#include "CCConsole.h" #include "base/CCConsole.h"
#include "CCUserDefault.h" #include "CCUserDefault.h"
#include "CCVertex.h" #include "CCVertex.h"

2
cocos/CCConsole.cpp → cocos/base/CCConsole.cpp
View File

@ -22,7 +22,7 @@
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "CCConsole.h" #include "base/CCConsole.h"
#include <thread> #include <thread>

0
cocos/CCConsole.h → cocos/base/CCConsole.h
View File

2
samples/Cpp/TestCpp/Classes/controller.cpp
View File

@ -15,8 +15,6 @@ struct {
std::function<TestScene*()> callback; std::function<TestScene*()> callback;
} g_aTestNames[] = { } g_aTestNames[] = {
{ "ConsoleTest", []() { return new ConsoleTestScene(); } },
// //
// TESTS MUST BE ORDERED ALPHABETICALLY // TESTS MUST BE ORDERED ALPHABETICALLY
// violators will be prosecuted // violators will be prosecuted