Moves CCConsole.* to base/

2013-12-04 18:09:23 -08:00 · 2013-12-04 18:09:23 -08:00 · f42aef0af8
parent c2a88154af
commit f42aef0af8
5 changed files with 3 additions and 5 deletions
--- a/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id
+++ b/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id
@ -1 +1 @@
-dfa173be6dd2c75b38aa6a33c6e53d9d013bd1d4
+952fb6950a128b17bdd2a4ffb998c22319a95bf0
--- a/cocos/2d/cocos2d.h
+++ b/cocos/2d/cocos2d.h
@ -199,7 +199,7 @@ THE SOFTWARE.
 #include "ccUTF8.h"
 #include "CCNotificationCenter.h"
 #include "CCProfiling.h"
-#include "CCConsole.h"
+#include "base/CCConsole.h"
 #include "CCUserDefault.h"
 #include "CCVertex.h"

--- a/cocos/base/CCConsole.cpp
+++ b/cocos/base/CCConsole.cpp
@ -22,7 +22,7 @@
 THE SOFTWARE.
 ****************************************************************************/

-#include "CCConsole.h"
+#include "base/CCConsole.h"

 #include <thread>

--- a/cocos/base/CCConsole.h
+++ b/cocos/base/CCConsole.h
--- a/samples/Cpp/TestCpp/Classes/controller.cpp
+++ b/samples/Cpp/TestCpp/Classes/controller.cpp
@ -15,8 +15,6 @@ struct {
 	std::function<TestScene*()> callback;
 } g_aTestNames[] = {

-    { "ConsoleTest", []() { return new ConsoleTestScene(); } },
-
    //
    // TESTS MUST BE ORDERED ALPHABETICALLY
    //     violators will be prosecuted