Remove common acting as an inc dir, VS loves it, GCC hates it.

2026-01-08 15:33:53 +00:00 · 2016-09-12 00:01:20 -07:00 · 2016-09-12 00:01:20 -07:00 · 3469af6777
commit 3469af6777
parent 2fd439dd0b
21 changed files with 53 additions and 54 deletions
--- 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")
--- a/common/net/daybreak_connection.cpp
+++ b/common/net/daybreak_connection.cpp
@ -1,7 +1,7 @@
 #include "daybreak_connection.h"
-#include <event/event_loop.h>
-#include <eqemu_logsys.h>
-#include <net/crc32.h>
+#include "../event/event_loop.h"
+#include "../eqemu_logsys.h"
+#include "crc32.h"
 #include <zlib.h>
 #include <sstream>

--- a/common/net/daybreak_connection.h
+++ b/common/net/daybreak_connection.h
@ -1,8 +1,8 @@
 #pragma once

-#include <random.h>
-#include <net/packet.h>
-#include <net/daybreak_structs.h>
+#include "../random.h"
+#include "packet.h"
+#include "daybreak_structs.h"
 #include <uv.h>
 #include <chrono>
 #include <functional>
--- a/common/net/daybreak_structs.h
+++ b/common/net/daybreak_structs.h
@ -2,7 +2,7 @@

 #include <cereal/cereal.hpp>
 #include <cstdint>
-#include <net/endian.h>
+#include "endian.h"

 namespace EQ
 {
--- a/common/net/eqstream.cpp
+++ b/common/net/eqstream.cpp
@ -1,5 +1,5 @@
 #include "eqstream.h"
-#include <eqemu_logsys.h>
+#include "../eqemu_logsys.h"

 EQ::Net::EQStreamManager::EQStreamManager(EQStreamManagerOptions &options) : m_daybreak(options.daybreak_options)
 {
--- a/common/net/eqstream.h
+++ b/common/net/eqstream.h
@ -1,7 +1,7 @@
 #pragma once

-#include <patch/patch.h>
-#include <eq_packet.h>
+#include "../patch/patch.h"
+#include "../eq_packet.h"
 #include "daybreak_connection.h"
 #include <vector>

--- a/common/net/packet.cpp
+++ b/common/net/packet.cpp
@ -1,5 +1,5 @@
 #include "packet.h"
-#include <net/endian.h>
+#include "endian.h"
 #include <fmt/format.h>
 #include <cctype>

--- a/common/net/packet.h
+++ b/common/net/packet.h
@ -4,7 +4,7 @@
 #include <string>
 #include <stdexcept>
 #include <cstring>
-#include <util/memory_stream.h>
+#include "../util/memory_stream.h"
 #include <cereal/cereal.hpp>
 #include <cereal/archives/binary.hpp>

--- a/common/patch/chat.h
+++ b/common/patch/chat.h
@ -1,4 +1,4 @@
-#include <patch/patch.h>
+#include "../patch/patch.h"

 namespace EQ
 {
--- a/common/patch/login_sod.h
+++ b/common/patch/login_sod.h
@ -1,4 +1,4 @@
-#include <patch/patch.h>
+#include "../patch/patch.h"

 namespace EQ
 {
--- a/common/patch/login_titanium.h
+++ b/common/patch/login_titanium.h
@ -1,4 +1,4 @@
-#include <patch/patch.h>
+#include "../patch/patch.h"

 namespace EQ
 {
--- a/common/patch/patch.cpp
+++ b/common/patch/patch.cpp
@ -1,5 +1,5 @@
 #include "patch.h"
-#include <eqemu_logsys.h>
+#include "../eqemu_logsys.h"

 EQ::Patches::IdentityMatchStatus EQ::Patches::BasePatch::TryIdentityMatch(const EQ::Net::Packet &p) const
 {
--- a/common/patch/patch.h
+++ b/common/patch/patch.h
@ -1,8 +1,8 @@
 #pragma once

-#include <opcodemgr.h>
-#include <net/packet.h>
-#include <net/daybreak_connection.h>
+#include "../opcodemgr.h"
+#include "../net/packet.h"
+#include "../net/daybreak_connection.h"
 #include <functional>
 #include <memory>
 #include <map>
--- a/loginserver/client.cpp
+++ b/loginserver/client.cpp
@ -18,8 +18,8 @@
 #include "client.h"
 #include "login_server.h"
 #include "login_structures.h"
-#include <misc_functions.h>
-#include <eqemu_logsys.h>
+#include "../common/misc_functions.h"
+#include "../common/eqemu_logsys.h"

 extern EQEmuLogSys Log;
 extern LoginServer server;
--- a/loginserver/client.h
+++ b/loginserver/client.h
@ -18,9 +18,9 @@
 #ifndef EQEMU_CLIENT_H
 #define EQEMU_CLIENT_H

-#include <global_define.h>
-#include <net/eqstream.h>
-#include <random.h>
+#include "../common/global_define.h"
+#include "../common/net/eqstream.h"
+#include "../common/random.h"
 #ifndef WIN32
 #include "eq_crypto_api.h"
 #endif
--- a/loginserver/client_manager.cpp
+++ b/loginserver/client_manager.cpp
@ -17,7 +17,7 @@
 */
 #include "client_manager.h"
 #include "login_server.h"
-#include <eqemu_logsys.h>
+#include "../common/eqemu_logsys.h"

 extern LoginServer server;
 extern bool run_server;
--- a/loginserver/client_manager.h
+++ b/loginserver/client_manager.h
@ -18,10 +18,10 @@
 #ifndef EQEMU_CLIENTMANAGER_H
 #define EQEMU_CLIENTMANAGER_H

-#include <global_define.h>
-#include <net/eqstream.h>
-#include <patch/login_sod.h>
-#include <patch/login_titanium.h>
+#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 <list>
 #include <memory>
--- 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 <global_define.h>
-#include <types.h>
-#include <opcodemgr.h>
-#include <eq_stream_factory.h>
-#include <timer.h>
-#include <platform.h>
-#include <crash.h>
-#include <eqemu_logsys.h>
-#include <event/timer.h>
+#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 <time.h>
 #include <stdlib.h>
--- a/ucs/clientlist.cpp
+++ b/ucs/clientlist.cpp
@ -17,9 +17,9 @@

 */

-#include <global_define.h>
-#include <string_util.h>
-#include <eqemu_logsys.h>
+#include "../common/global_define.h"
+#include "../common/string_util.h"
+#include "../common/eqemu_logsys.h"

 #include "clientlist.h"
 #include "database.h"
--- a/ucs/clientlist.h
+++ b/ucs/clientlist.h
@ -20,10 +20,10 @@
 #ifndef CHATSERVER_CLIENTLIST_H
 #define CHATSERVER_CLIENTLIST_H

-#include <net/eqstream.h>
-#include <rulesys.h>
-#include <patch/chat.h>
-#include <event/timer.h>
+#include "../common/net/eqstream.h"
+#include "../common/rulesys.h"
+#include "../common/patch/chat.h"
+#include "../common/event/timer.h"
 #include "chatchannel.h"
 #include <list>
 #include <vector>
--- a/ucs/ucs.cpp
+++ b/ucs/ucs.cpp
@ -17,15 +17,15 @@

 */

-#include <eqemu_logsys.h>
-#include <global_define.h>
-#include <timeoutmgr.h>
+#include "../common/eqemu_logsys.h"
+#include "../common/global_define.h"
+#include "../common/timeoutmgr.h"
 #include "clientlist.h"
-#include <rulesys.h>
-#include <servertalk.h>
-#include <platform.h>
-#include <crash.h>
-#include <event/event_loop.h>
+#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"