From 3469af677790d53d23d4ea16637c82e705c88d33 Mon Sep 17 00:00:00 2001 From: KimLS Date: Mon, 12 Sep 2016 00:01:20 -0700 Subject: [PATCH] Remove common acting as an inc dir, VS loves it, GCC hates it. --- CMakeLists.txt | 1 - common/net/daybreak_connection.cpp | 6 +++--- common/net/daybreak_connection.h | 6 +++--- common/net/daybreak_structs.h | 2 +- common/net/eqstream.cpp | 2 +- common/net/eqstream.h | 4 ++-- common/net/packet.cpp | 2 +- common/net/packet.h | 2 +- common/patch/chat.h | 2 +- common/patch/login_sod.h | 2 +- common/patch/login_titanium.h | 2 +- common/patch/patch.cpp | 2 +- common/patch/patch.h | 6 +++--- loginserver/client.cpp | 4 ++-- loginserver/client.h | 6 +++--- loginserver/client_manager.cpp | 2 +- loginserver/client_manager.h | 8 ++++---- loginserver/main.cpp | 18 +++++++++--------- ucs/clientlist.cpp | 6 +++--- ucs/clientlist.h | 8 ++++---- ucs/ucs.cpp | 16 ++++++++-------- 21 files changed, 53 insertions(+), 54 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6ffa7775c..25e6b586b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -336,7 +336,6 @@ ENDIF(EQEMU_BUILD_LUA) INCLUDE_DIRECTORIES(SYSTEM "${ZLIB_INCLUDE_DIRS}") INCLUDE_DIRECTORIES(SYSTEM "${MySQL_INCLUDE_DIR}") INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/common/glm") -INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/common") INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/libs/cereal") INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/libs/libuv/include" ) INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/libs/libuv/src") diff --git a/common/net/daybreak_connection.cpp b/common/net/daybreak_connection.cpp index 7c1104bce..9edac9aae 100644 --- a/common/net/daybreak_connection.cpp +++ b/common/net/daybreak_connection.cpp @@ -1,7 +1,7 @@ #include "daybreak_connection.h" -#include -#include -#include +#include "../event/event_loop.h" +#include "../eqemu_logsys.h" +#include "crc32.h" #include #include diff --git a/common/net/daybreak_connection.h b/common/net/daybreak_connection.h index facd2436e..010d89e45 100644 --- a/common/net/daybreak_connection.h +++ b/common/net/daybreak_connection.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "../random.h" +#include "packet.h" +#include "daybreak_structs.h" #include #include #include diff --git a/common/net/daybreak_structs.h b/common/net/daybreak_structs.h index 475fb2d6d..48452ff89 100644 --- a/common/net/daybreak_structs.h +++ b/common/net/daybreak_structs.h @@ -2,7 +2,7 @@ #include #include -#include +#include "endian.h" namespace EQ { diff --git a/common/net/eqstream.cpp b/common/net/eqstream.cpp index b2c9864d5..7b16ec331 100644 --- a/common/net/eqstream.cpp +++ b/common/net/eqstream.cpp @@ -1,5 +1,5 @@ #include "eqstream.h" -#include +#include "../eqemu_logsys.h" EQ::Net::EQStreamManager::EQStreamManager(EQStreamManagerOptions &options) : m_daybreak(options.daybreak_options) { diff --git a/common/net/eqstream.h b/common/net/eqstream.h index 97a66d713..0b51fc53d 100644 --- a/common/net/eqstream.h +++ b/common/net/eqstream.h @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "../patch/patch.h" +#include "../eq_packet.h" #include "daybreak_connection.h" #include diff --git a/common/net/packet.cpp b/common/net/packet.cpp index 2ef0ec879..b0eac3f73 100644 --- a/common/net/packet.cpp +++ b/common/net/packet.cpp @@ -1,5 +1,5 @@ #include "packet.h" -#include +#include "endian.h" #include #include diff --git a/common/net/packet.h b/common/net/packet.h index c37f4f8e4..43b36d71b 100644 --- a/common/net/packet.h +++ b/common/net/packet.h @@ -4,7 +4,7 @@ #include #include #include -#include +#include "../util/memory_stream.h" #include #include diff --git a/common/patch/chat.h b/common/patch/chat.h index d7302ca16..0e86cc9ab 100644 --- a/common/patch/chat.h +++ b/common/patch/chat.h @@ -1,4 +1,4 @@ -#include +#include "../patch/patch.h" namespace EQ { diff --git a/common/patch/login_sod.h b/common/patch/login_sod.h index 56a1f928b..ecb606823 100644 --- a/common/patch/login_sod.h +++ b/common/patch/login_sod.h @@ -1,4 +1,4 @@ -#include +#include "../patch/patch.h" namespace EQ { diff --git a/common/patch/login_titanium.h b/common/patch/login_titanium.h index 8b8e45c99..0e6e5f9bb 100644 --- a/common/patch/login_titanium.h +++ b/common/patch/login_titanium.h @@ -1,4 +1,4 @@ -#include +#include "../patch/patch.h" namespace EQ { diff --git a/common/patch/patch.cpp b/common/patch/patch.cpp index 718734cc3..8d4c4f6af 100644 --- a/common/patch/patch.cpp +++ b/common/patch/patch.cpp @@ -1,5 +1,5 @@ #include "patch.h" -#include +#include "../eqemu_logsys.h" EQ::Patches::IdentityMatchStatus EQ::Patches::BasePatch::TryIdentityMatch(const EQ::Net::Packet &p) const { diff --git a/common/patch/patch.h b/common/patch/patch.h index a63f5ceca..603f3a13c 100644 --- a/common/patch/patch.h +++ b/common/patch/patch.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "../opcodemgr.h" +#include "../net/packet.h" +#include "../net/daybreak_connection.h" #include #include #include diff --git a/loginserver/client.cpp b/loginserver/client.cpp index 5b6540ed8..c13cb1b43 100644 --- a/loginserver/client.cpp +++ b/loginserver/client.cpp @@ -18,8 +18,8 @@ #include "client.h" #include "login_server.h" #include "login_structures.h" -#include -#include +#include "../common/misc_functions.h" +#include "../common/eqemu_logsys.h" extern EQEmuLogSys Log; extern LoginServer server; diff --git a/loginserver/client.h b/loginserver/client.h index a30ac30b2..b8e758d6a 100644 --- a/loginserver/client.h +++ b/loginserver/client.h @@ -18,9 +18,9 @@ #ifndef EQEMU_CLIENT_H #define EQEMU_CLIENT_H -#include -#include -#include +#include "../common/global_define.h" +#include "../common/net/eqstream.h" +#include "../common/random.h" #ifndef WIN32 #include "eq_crypto_api.h" #endif diff --git a/loginserver/client_manager.cpp b/loginserver/client_manager.cpp index 5ecc1f9e9..5aa7fc1e3 100644 --- a/loginserver/client_manager.cpp +++ b/loginserver/client_manager.cpp @@ -17,7 +17,7 @@ */ #include "client_manager.h" #include "login_server.h" -#include +#include "../common/eqemu_logsys.h" extern LoginServer server; extern bool run_server; diff --git a/loginserver/client_manager.h b/loginserver/client_manager.h index b76e1d761..7ac89ecac 100644 --- a/loginserver/client_manager.h +++ b/loginserver/client_manager.h @@ -18,10 +18,10 @@ #ifndef EQEMU_CLIENTMANAGER_H #define EQEMU_CLIENTMANAGER_H -#include -#include -#include -#include +#include "../common/global_define.h" +#include "../common/net/eqstream.h" +#include "../common/patch/login_sod.h" +#include "../common/patch/login_titanium.h" #include "client.h" #include #include diff --git a/loginserver/main.cpp b/loginserver/main.cpp index 2abcd35b7..b1ec2e677 100644 --- a/loginserver/main.cpp +++ b/loginserver/main.cpp @@ -15,15 +15,15 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "../common/global_define.h" +#include "../common/types.h" +#include "../common/opcodemgr.h" +#include "../common/eq_stream_factory.h" +#include "../common/timer.h" +#include "../common/platform.h" +#include "../common/crash.h" +#include "../common/eqemu_logsys.h" +#include "../common/event/timer.h" #include "login_server.h" #include #include diff --git a/ucs/clientlist.cpp b/ucs/clientlist.cpp index a7ad95d50..ff9f67b0a 100644 --- a/ucs/clientlist.cpp +++ b/ucs/clientlist.cpp @@ -17,9 +17,9 @@ */ -#include -#include -#include +#include "../common/global_define.h" +#include "../common/string_util.h" +#include "../common/eqemu_logsys.h" #include "clientlist.h" #include "database.h" diff --git a/ucs/clientlist.h b/ucs/clientlist.h index 0cb2b2034..72dba31a6 100644 --- a/ucs/clientlist.h +++ b/ucs/clientlist.h @@ -20,10 +20,10 @@ #ifndef CHATSERVER_CLIENTLIST_H #define CHATSERVER_CLIENTLIST_H -#include -#include -#include -#include +#include "../common/net/eqstream.h" +#include "../common/rulesys.h" +#include "../common/patch/chat.h" +#include "../common/event/timer.h" #include "chatchannel.h" #include #include diff --git a/ucs/ucs.cpp b/ucs/ucs.cpp index 3668695e4..bbfe4f766 100644 --- a/ucs/ucs.cpp +++ b/ucs/ucs.cpp @@ -17,15 +17,15 @@ */ -#include -#include -#include +#include "../common/eqemu_logsys.h" +#include "../common/global_define.h" +#include "../common/timeoutmgr.h" #include "clientlist.h" -#include -#include -#include -#include -#include +#include "../common/rulesys.h" +#include "../common/servertalk.h" +#include "../common/platform.h" +#include "../common/crash.h" +#include "../common/event/event_loop.h" #include "database.h" #include "ucsconfig.h" #include "chatchannel.h"