diff --git a/CMakeLists.txt b/CMakeLists.txt index 490475b0b..22bcbe6c5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -90,8 +90,6 @@ find_package(zlib-ng CONFIG REQUIRED) pkg_check_modules(luajit REQUIRED luajit) find_package(PerlLibs) -include_directories(SYSTEM "${Boost_INCLUDE_DIR}") - MESSAGE(STATUS "**************************************************") MESSAGE(STATUS "* Library Detection *") MESSAGE(STATUS "**************************************************") @@ -132,9 +130,12 @@ MESSAGE(STATUS "PERL_INCLUDE_DIR: ${PERL_INCLUDE_DIR}") MESSAGE(STATUS "PERL_INCLUDE_DIRS: ${PERL_INCLUDE_DIRS}") MESSAGE(STATUS "PERL_LIBRARIES: ${PERL_LIBRARIES}") MESSAGE(STATUS "PERL_VERSION: ${PERL_VERSION}") - MESSAGE(STATUS "**************************************************") +INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/websocketpp") + +ADD_DEFINITIONS(-DBOOST_BIND_GLOBAL_PLACEHOLDERS) + #options OPTION(EQEMU_COMMANDS_LOGGING "Enable GM Command logs" ON) OPTION(EQEMU_BUILD_SERVER "Build the game server." ON) diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index 45af7b94d..d2eb1fca0 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -835,6 +835,8 @@ INCLUDE_DIRECTORIES(Patches SocketLib StackWalker) ADD_LIBRARY(common ${common_sources} ${common_headers} ${repositories}) +target_link_libraries(common PRIVATE cereal::cereal fmt::fmt unofficial::libmariadb $,libuv::uv_a,libuv::uv> zlib-ng::zlib) + IF (UNIX) SET_SOURCE_FILES_PROPERTIES("SocketLib/Mime.cpp" PROPERTY COMPILE_FLAGS -Wno-unused-result) SET_SOURCE_FILES_PROPERTIES("patches/sod.cpp" "patches/sof.cpp" "patches/rof.cpp" "patches/rof2.cpp" "patches/uf.cpp" PROPERTIES COMPILE_FLAGS -O0) diff --git a/common/classes.cpp b/common/classes.cpp index f849a5bfd..df1350004 100644 --- a/common/classes.cpp +++ b/common/classes.cpp @@ -16,6 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include +#include #include "../common/global_define.h" #include "../common/classes.h" #include "data_verification.h" diff --git a/common/cli/eqemu_command_handler.cpp b/common/cli/eqemu_command_handler.cpp index 9017adbb3..bf796b42b 100644 --- a/common/cli/eqemu_command_handler.cpp +++ b/common/cli/eqemu_command_handler.cpp @@ -19,6 +19,7 @@ */ #include +#include #include "eqemu_command_handler.h" #include "terminal_color.hpp" #include "../platform.h" diff --git a/common/dynamic_zone_lockout.cpp b/common/dynamic_zone_lockout.cpp index a47a9e205..a714dc101 100644 --- a/common/dynamic_zone_lockout.cpp +++ b/common/dynamic_zone_lockout.cpp @@ -3,6 +3,7 @@ #include "rulesys.h" #include "util/uuid.h" #include +#include #include DzLockout::DzLockout(std::string uuid, std::string expedition, std::string event, uint64_t expire_time, uint32_t duration) diff --git a/common/eqemu_config.h b/common/eqemu_config.h index 57a0543c8..94b0fea52 100644 --- a/common/eqemu_config.h +++ b/common/eqemu_config.h @@ -23,6 +23,7 @@ #include "path_manager.h" #include #include +#include struct LoginConfig { std::string LoginHost; diff --git a/common/eqemu_logsys.h b/common/eqemu_logsys.h index 0757b3e98..210d784f8 100644 --- a/common/eqemu_logsys.h +++ b/common/eqemu_logsys.h @@ -34,6 +34,7 @@ #endif #include +#include #include "types.h" namespace Logs { diff --git a/common/events/player_event_discord_formatter.cpp b/common/events/player_event_discord_formatter.cpp index 5b068f507..b25680902 100644 --- a/common/events/player_event_discord_formatter.cpp +++ b/common/events/player_event_discord_formatter.cpp @@ -3,6 +3,7 @@ #include "../json/json_archive_single_line.h" #include #include +#include #include #include diff --git a/common/file.cpp b/common/file.cpp index 97eec9051..df15255af 100644 --- a/common/file.cpp +++ b/common/file.cpp @@ -36,6 +36,7 @@ #endif #include +#include #include #include #include diff --git a/common/ip_util.cpp b/common/ip_util.cpp index df4abcfc0..c0316ea10 100644 --- a/common/ip_util.cpp +++ b/common/ip_util.cpp @@ -20,6 +20,7 @@ #include #include +#include #include #include #include "ip_util.h" diff --git a/common/net/console_server.cpp b/common/net/console_server.cpp index a5276f4cf..4cc2b2126 100644 --- a/common/net/console_server.cpp +++ b/common/net/console_server.cpp @@ -1,6 +1,7 @@ #include "console_server.h" #include "../strings.h" #include +#include EQ::Net::ConsoleServer::ConsoleServer(const std::string &addr, int port) { diff --git a/common/net/console_server_connection.cpp b/common/net/console_server_connection.cpp index e53058f67..47e321b80 100644 --- a/common/net/console_server_connection.cpp +++ b/common/net/console_server_connection.cpp @@ -5,6 +5,7 @@ #include "../servertalk.h" #include "../rulesys.h" #include +#include EQ::Net::ConsoleServerConnection::ConsoleServerConnection(ConsoleServer *parent, std::shared_ptr connection) { diff --git a/common/net/packet.cpp b/common/net/packet.cpp index 1ae959e62..a4ec4b498 100644 --- a/common/net/packet.cpp +++ b/common/net/packet.cpp @@ -2,6 +2,7 @@ #include "endian.h" #include #include +#include void EQ::Net::Packet::PutInt8(size_t offset, int8_t value) { diff --git a/common/net/reliable_stream_connection.cpp b/common/net/reliable_stream_connection.cpp index e1101f452..c75bfe77a 100644 --- a/common/net/reliable_stream_connection.cpp +++ b/common/net/reliable_stream_connection.cpp @@ -4,6 +4,7 @@ #include "crc32.h" #include #include +#include // observed client receive window is 300 packets, 140KB constexpr size_t MAX_CLIENT_RECV_PACKETS_PER_WINDOW = 300; diff --git a/common/net/websocket_server.cpp b/common/net/websocket_server.cpp index f74f437ba..1e8b80b64 100644 --- a/common/net/websocket_server.cpp +++ b/common/net/websocket_server.cpp @@ -2,6 +2,7 @@ #include "../event/event_loop.h" #include "../event/timer.h" #include +#include #include #include #include diff --git a/common/net/websocket_server_connection.cpp b/common/net/websocket_server_connection.cpp index 3c1271518..36e85eb74 100644 --- a/common/net/websocket_server_connection.cpp +++ b/common/net/websocket_server_connection.cpp @@ -4,6 +4,7 @@ #include "../util/uuid.h" #include #include +#include struct EQ::Net::WebsocketServerConnection::Impl { WebsocketServer *parent; diff --git a/common/process/process.cpp b/common/process/process.cpp index 56bbeff2b..92bf757f4 100644 --- a/common/process/process.cpp +++ b/common/process/process.cpp @@ -2,6 +2,7 @@ #include #include "process.h" #include +#include std::string Process::execute(const std::string &cmd) { diff --git a/common/profanity_manager.h b/common/profanity_manager.h index 311ca19e0..165b6516e 100644 --- a/common/profanity_manager.h +++ b/common/profanity_manager.h @@ -23,7 +23,7 @@ #include #include #include - +#include class DBcore; diff --git a/common/rulesys.cpp b/common/rulesys.cpp index f73112b1b..3e6f833a8 100644 --- a/common/rulesys.cpp +++ b/common/rulesys.cpp @@ -23,6 +23,7 @@ #include #include #include +#include #include "../common/repositories/rule_sets_repository.h" #include "../common/repositories/rule_values_repository.h" diff --git a/common/shareddb.cpp b/common/shareddb.cpp index 0ef0cbe4e..89da73410 100644 --- a/common/shareddb.cpp +++ b/common/shareddb.cpp @@ -19,6 +19,7 @@ #include #include #include +#include #if defined(_MSC_VER) && _MSC_VER >= 1800 #include diff --git a/common/strings.cpp b/common/strings.cpp index eb56ab2f5..cdb754cad 100644 --- a/common/strings.cpp +++ b/common/strings.cpp @@ -36,6 +36,7 @@ #include "strings.h" #include #include +#include #include #include diff --git a/common/util/uuid.cpp b/common/util/uuid.cpp index 7acd1517f..1e221b5b9 100644 --- a/common/util/uuid.cpp +++ b/common/util/uuid.cpp @@ -2,6 +2,7 @@ #include #include +#include #ifdef _WIN32 #include diff --git a/libs/luabind/CMakeLists.txt b/libs/luabind/CMakeLists.txt index ac9e1224e..b261f4c60 100644 --- a/libs/luabind/CMakeLists.txt +++ b/libs/luabind/CMakeLists.txt @@ -25,7 +25,7 @@ SET(lb_headers ) add_library(luabind ${lb_sources} ${lb_headers}) -target_link_libraries(luabind PRIVATE luajit) +target_link_libraries(luabind PRIVATE luajit Boost::dynamic_bitset Boost::tuple Boost::foreach) IF(UNIX) set_source_files_properties(${lb_sources} PROPERTY COMPILE_FLAGS -Wno-deprecated-declarations)