chore(console): move client/Console.* files under console/Client.*

src/client/Client.cpp

@@ -1,8 +1,9 @@
 #include "client/Client.hpp"
-#include "client/ClientServices.hpp"
-#include "client/Console.hpp"
-#include "db/Db.hpp"
 #include "async/AsyncFile.hpp"
+#include "client/ClientServices.hpp"
+#include "console/CVar.hpp"
+#include "console/Client.hpp"
+#include "db/Db.hpp"
 #include "glue/CGlueMgr.hpp"
 #include "gx/Screen.hpp"
 #include "gx/Texture.hpp"
@@ -10,7 +11,6 @@
 #include "net/Poll.hpp"
 #include "ui/FrameScript.hpp"
 #include "ui/FrameXML.hpp"
-#include "console/CVar.hpp"
 #include "world/World.hpp"
 #include <bc/Debug.hpp>
 #include <common/Prop.hpp>

src/console/CMakeLists.txt

@@ -15,4 +15,6 @@ target_link_libraries(console
     PUBLIC
         common
         storm
+    PRIVATE
+        client
 )

src/console/Client.cpp

@@ -1,8 +1,8 @@
-#include "client/Console.hpp"
+#include "console/Client.hpp"
 #include "client/Gui.hpp"
+#include "console/CVar.hpp"
 #include "event/Input.hpp"
 #include "gx/Device.hpp"
-#include "console/CVar.hpp"
 #include <cstring>
 
 CVar* s_cvGxMaximize;

src/console/Client.hpp

@@ -1,5 +1,5 @@
-#ifndef CLIENT_CONSOLE_HPP
+#ifndef CONSOLE_CLIENT_HPP
-#define CLIENT_CONSOLE_HPP
+#define CONSOLE_CLIENT_HPP
 
 #include "gx/CGxFormat.hpp"