From f42aef0af86225fd26b517dd29a5ca7436aee9a7 Mon Sep 17 00:00:00 2001
From: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed, 4 Dec 2013 18:09:23 -0800
Subject: [PATCH] Moves CCConsole.* to base/

---
 build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id | 2 +-
 cocos/2d/cocos2d.h                                          | 2 +-
 cocos/{ => base}/CCConsole.cpp                              | 2 +-
 cocos/{ => base}/CCConsole.h                                | 0
 samples/Cpp/TestCpp/Classes/controller.cpp                  | 2 --
 5 files changed, 3 insertions(+), 5 deletions(-)
 rename cocos/{ => base}/CCConsole.cpp (99%)
 rename cocos/{ => base}/CCConsole.h (100%)

diff --git a/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id b/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id
index 195d2a651e..023c804295 100644
--- a/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id
+++ b/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id
@@ -1 +1 @@
-dfa173be6dd2c75b38aa6a33c6e53d9d013bd1d4
\ No newline at end of file
+952fb6950a128b17bdd2a4ffb998c22319a95bf0
\ No newline at end of file
diff --git a/cocos/2d/cocos2d.h b/cocos/2d/cocos2d.h
index c33dddf82d..c531f62965 100644
--- 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"
 
diff --git a/cocos/CCConsole.cpp b/cocos/base/CCConsole.cpp
similarity index 99%
rename from cocos/CCConsole.cpp
rename to cocos/base/CCConsole.cpp
index 62cd20e1c6..927d79bec4 100644
--- a/cocos/CCConsole.cpp
+++ b/cocos/base/CCConsole.cpp
@@ -22,7 +22,7 @@
  THE SOFTWARE.
  ****************************************************************************/
 
-#include "CCConsole.h"
+#include "base/CCConsole.h"
 
 #include <thread>
 
diff --git a/cocos/CCConsole.h b/cocos/base/CCConsole.h
similarity index 100%
rename from cocos/CCConsole.h
rename to cocos/base/CCConsole.h
diff --git a/samples/Cpp/TestCpp/Classes/controller.cpp b/samples/Cpp/TestCpp/Classes/controller.cpp
index 8cebe13e43..f6236eda73 100644
--- 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