mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-26 06:27:45 +00:00
Code Activity

Another attempt at fixing the build

Browse source
This commit is contained in:
Mordred Admin 2017-12-18 14:45:15 +01:00
parent 32d886675c
commit 4606e83d15
18 changed files with 37 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -61,6 +61,8 @@ add_subdirectory("src/servers")
add_subdirectory("src/libraries/sapphire/datReader") add_subdirectory("src/libraries/sapphire/datReader")
add_subdirectory("src/libraries/sapphire/mysqlConnector") add_subdirectory("src/libraries/sapphire/mysqlConnector")
add_subdirectory("src/common")
add_subdirectory("src/tools/exd_common_gen") add_subdirectory("src/tools/exd_common_gen")
add_subdirectory("src/tools/exd_struct_gen") add_subdirectory("src/tools/exd_struct_gen")
add_subdirectory("src/tools/exd_struct_test") add_subdirectory("src/tools/exd_struct_test")

11
src/common/CMakeLists.txt
View file

@ -7,7 +7,7 @@ file(GLOB UTILS_PUBLIC_INCLUDE_FILES
"${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}"
"${CMAKE_CURRENT_SOURCE_DIR}/*.h") "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
file(GLOB UTILS_SOURCE_FILES file(GLOB UTILS_SOURCE_FILES
"${CMAKE_CURRENT_SOURCE_DIR}*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/Config/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/Config/*.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/Crypt/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/Crypt/*.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/Database/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/Database/*.cpp"
@ -17,12 +17,13 @@ file(GLOB UTILS_SOURCE_FILES
"${CMAKE_CURRENT_SOURCE_DIR}/Network/PacketDef/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/Network/PacketDef/*.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/Script/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/Script/*.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/Util/*.cpp") "${CMAKE_CURRENT_SOURCE_DIR}/Util/*.cpp")
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
add_library(Common ${UTILS_PUBLIC_INCLUDE_FILES} ${UTILS_SOURCE_FILES}) add_library(common ${UTILS_PUBLIC_INCLUDE_FILES} ${UTILS_SOURCE_FILES})
set_target_properties(Common PROPERTIES set_target_properties(common PROPERTIES
CXX_STANDARD 14 CXX_STANDARD 14
CXX_STANDARD_REQUIRED ON CXX_STANDARD_REQUIRED ON
CXX_EXTENSIONS ON CXX_EXTENSIONS ON
@ -33,7 +34,7 @@ set_target_properties(Common PROPERTIES
) )
if (UNIX) if (UNIX)
target_link_libraries( Common xivdat mysqlclient mysqlConnector ) target_link_libraries( common xivdat mysqlclient mysqlConnector )
else() else()
target_link_libraries( Common xivdat mysqlConnector libmysql ) target_link_libraries( common xivdat mysqlConnector libmysql )
endif() endif()

2
src/common/Database/DbConnection.cpp
View file

@ -2,7 +2,7 @@
#include "DbWorker.h" #include "DbWorker.h"
#include "src/libraries/sapphire/mysqlConnector/MySqlConnector.h" #include "src/libraries/sapphire/mysqlConnector/MySqlConnector.h"
#include "src/servers/Server_Common/Logging/Logger.h" #include <common/Logging/Logger.h>
#include "PreparedStatement.h" #include "PreparedStatement.h"
#include <boost/make_shared.hpp> #include <boost/make_shared.hpp>

2
src/common/Database/DbLoader.cpp
View file

@ -2,7 +2,7 @@
#include <mysqld_error.h> #include <mysqld_error.h>
#include "CharaDbConnection.h" #include "CharaDbConnection.h"
#include "DbWorkerPool.h" #include "DbWorkerPool.h"
#include "src/servers/Server_Common/Logging/Logger.h" #include <common/Logging/Logger.h>
extern Core::Logger g_log; extern Core::Logger g_log;

2
src/common/Database/DbWorker.cpp
View file

@ -1,6 +1,6 @@
#include "DbWorker.h" #include "DbWorker.h"
#include "Operation.h" #include "Operation.h"
#include <Server_Common/Util/LockedWaitQueue.h> #include <common/Util/LockedWaitQueue.h>
Core::Db::DbWorker::DbWorker( Core::LockedWaitQueue< boost::shared_ptr< Operation > >* newQueue, DbConnection* pConn ) Core::Db::DbWorker::DbWorker( Core::LockedWaitQueue< boost::shared_ptr< Operation > >* newQueue, DbConnection* pConn )
{ {

2
src/common/Database/DbWorker.h
View file

@ -3,7 +3,7 @@
#include <atomic> #include <atomic>
#include <thread> #include <thread>
#include <Server_Common/Util/LockedWaitQueue.h> #include <common/Util/LockedWaitQueue.h>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
namespace Core namespace Core

4
src/common/Database/DbWorkerPool.cpp
View file

@ -7,7 +7,7 @@
#include "CharaDbConnection.h" #include "CharaDbConnection.h"
#include <boost/make_shared.hpp> #include <boost/make_shared.hpp>
#include <Server_Common/Logging/Logger.h> #include <common/Logging/Logger.h>
extern Core::Logger g_log; extern Core::Logger g_log;
class PingOperation : public Core::Db::Operation class PingOperation : public Core::Db::Operation
@ -273,4 +273,4 @@ void DatabaseWorkerPool<T>::ExecuteOrAppend(SQLTransaction& trans, PreparedState
} }
*/ */
template class Core::Db::DbWorkerPool< Core::Db::CharaDbConnection >; template class Core::Db::DbWorkerPool< Core::Db::CharaDbConnection >;

6
src/common/Network/Acceptor.cpp
View file

@ -1,6 +1,6 @@
#include "src/servers/Server_Common/Network/Hive.h" #include <common/Network/Hive.h>
#include "Acceptor.h" #include "Acceptor.h"
#include "src/servers/Server_Common/Network/Connection.h" #include <common/Network/Connection.h>
#include <boost/interprocess/detail/atomic.hpp> #include <boost/interprocess/detail/atomic.hpp>
#include <boost/bind.hpp> #include <boost/bind.hpp>
@ -127,4 +127,4 @@ namespace Core
} }
} }
} }

2
src/common/Network/GamePacket.cpp
View file

@ -5,7 +5,7 @@
#include <time.h> #include <time.h>
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
#include <boost/format.hpp> #include <boost/format.hpp>
#include "Server_Common/Util/Util.h" #include <common/Util/Util.h>
Core::Network::Packets::GamePacket::GamePacket( uint16_t subType, uint16_t size, uint32_t id1, uint32_t id2, uint16_t type ) Core::Network::Packets::GamePacket::GamePacket( uint16_t subType, uint16_t size, uint32_t id1, uint32_t id2, uint16_t type )
{ {

2
src/common/Network/PacketContainer.cpp
View file

@ -1,6 +1,6 @@
#include "PacketContainer.h" #include "PacketContainer.h"
#include "GamePacket.h" #include "GamePacket.h"
#include "src/servers/Server_Common/Common.h" #include <common/Common.h>
#include <boost/format.hpp> #include <boost/format.hpp>

2
src/common/Version.cpp
View file

@ -3,7 +3,7 @@
namespace Core { namespace Core {
namespace Version { namespace Version {
const std::string GIT_HASH = "1673292b62618715cecd0656402e934709779f0e"; const std::string GIT_HASH = "32d886675c6f621494001715e6cf9c99217e1b48";
const std::string VERSION = "-128-NOTFOUND"; const std::string VERSION = "-128-NOTFOUND";
} /* Version */ } /* Version */

6
src/servers/Server_Lobby/CMakeLists.txt
View file

@ -8,7 +8,7 @@ file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*")
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/") set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/")
add_executable(server_lobby ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES}) add_executable(server_lobby ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})
add_dependencies(server_lobby Common xivdat) add_dependencies(server_lobby common xivdat)
set_target_properties(server_lobby PROPERTIES set_target_properties(server_lobby PROPERTIES
CXX_STANDARD 14 CXX_STANDARD 14
@ -22,9 +22,9 @@ set_target_properties(server_lobby PROPERTIES
) )
if (UNIX) if (UNIX)
target_link_libraries(server_lobby Common xivdat pthread mysqlclient mysqlConnector dl z) target_link_libraries(server_lobby common xivdat pthread mysqlclient mysqlConnector dl z)
else() else()
target_link_libraries(server_lobby Common xivdat libmysql mysqlConnector zlib1) target_link_libraries(server_lobby common xivdat libmysql mysqlConnector zlib1)
endif() endif()
target_link_libraries(server_lobby ${Boost_LIBRARIES} ${Boost_LIBRARIES}) target_link_libraries(server_lobby ${Boost_LIBRARIES} ${Boost_LIBRARIES})

6
src/servers/Server_REST/CMakeLists.txt
View file

@ -7,7 +7,7 @@ file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*")
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/") set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/")
add_executable(server_rest ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES}) add_executable(server_rest ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})
add_dependencies(server_rest Common xivdat) add_dependencies(server_rest common xivdat)
set_target_properties(server_rest PROPERTIES set_target_properties(server_rest PROPERTIES
CXX_STANDARD 14 CXX_STANDARD 14
@ -21,12 +21,12 @@ set_target_properties(server_rest PROPERTIES
) )
if (UNIX) if (UNIX)
target_link_libraries (server_rest Common xivdat pthread mysqlclient mysqlConnector dl z) target_link_libraries (server_rest common xivdat pthread mysqlclient mysqlConnector dl z)
else() else()
# ignore unchecked iterators warnings from msvc # ignore unchecked iterators warnings from msvc
add_definitions(-D_SCL_SECURE_NO_WARNINGS) add_definitions(-D_SCL_SECURE_NO_WARNINGS)
target_link_libraries (server_rest Common xivdat libmysql mysqlConnector zlib1) target_link_libraries (server_rest common xivdat libmysql mysqlConnector zlib1)
endif() endif()

6
src/servers/Server_Zone/CMakeLists.txt
View file

@ -40,7 +40,7 @@ file(GLOB SERVER_SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/") set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/")
add_executable(server_zone ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES} ) add_executable(server_zone ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES} )
add_dependencies(server_zone Common xivdat mysqlConnector ) add_dependencies(server_zone common xivdat mysqlConnector )
set_target_properties(server_zone PROPERTIES set_target_properties(server_zone PROPERTIES
CXX_STANDARD 14 CXX_STANDARD 14
@ -56,9 +56,9 @@ set_target_properties(server_zone PROPERTIES
) )
if (UNIX) if (UNIX)
target_link_libraries ( server_zone Common xivdat pthread mysqlclient mysqlConnector dl z ) target_link_libraries ( server_zone common xivdat pthread mysqlclient mysqlConnector dl z )
else() else()
target_link_libraries ( server_zone Common xivdat libmysql zlib1 mysqlConnector ) target_link_libraries ( server_zone common xivdat libmysql zlib1 mysqlConnector )
endif() endif()
target_link_libraries(server_zone ${Boost_LIBRARIES} ) target_link_libraries(server_zone ${Boost_LIBRARIES} )

4
src/tools/exd_common_gen/CMakeLists.txt
View file

@ -24,9 +24,9 @@ set_target_properties(exd_common_gen PROPERTIES
) )
if (UNIX) if (UNIX)
target_link_libraries (exd_common_gen Common xivdat pthread mysqlclient dl z) target_link_libraries (exd_common_gen common xivdat pthread mysqlclient dl z)
else() else()
target_link_libraries (exd_common_gen Common xivdat libmysql zlib1) target_link_libraries (exd_common_gen common xivdat libmysql zlib1)
# ignore unchecked iterators warnings from msvc # ignore unchecked iterators warnings from msvc
add_definitions(-D_SCL_SECURE_NO_WARNINGS) add_definitions(-D_SCL_SECURE_NO_WARNINGS)

4
src/tools/exd_struct_gen/CMakeLists.txt
View file

@ -24,9 +24,9 @@ set_target_properties(exd_struct_gen PROPERTIES
) )
if (UNIX) if (UNIX)
target_link_libraries (exd_struct_gen Common xivdat pthread mysqlclient dl z) target_link_libraries (exd_struct_gen common xivdat pthread mysqlclient dl z)
else() else()
target_link_libraries (exd_struct_gen Common xivdat libmysql zlib1) target_link_libraries (exd_struct_gen common xivdat libmysql zlib1)
endif() endif()
target_link_libraries(exd_struct_gen ${Boost_LIBRARIES} ${Boost_LIBRARIES}) target_link_libraries(exd_struct_gen ${Boost_LIBRARIES} ${Boost_LIBRARIES})

4
src/tools/exd_struct_test/CMakeLists.txt
View file

@ -24,9 +24,9 @@ set_target_properties(exd_struct_test PROPERTIES
) )
if (UNIX) if (UNIX)
target_link_libraries (exd_struct_test Common xivdat pthread mysqlclient dl z) target_link_libraries (exd_struct_test common xivdat pthread mysqlclient dl z)
else() else()
target_link_libraries (exd_struct_test Common xivdat libmysql zlib1) target_link_libraries (exd_struct_test common xivdat libmysql zlib1)
endif() endif()
target_link_libraries(exd_struct_test ${Boost_LIBRARIES} ${Boost_LIBRARIES}) target_link_libraries(exd_struct_test ${Boost_LIBRARIES} ${Boost_LIBRARIES})

4
src/tools/quest_parser/CMakeLists.txt
View file

@ -30,9 +30,9 @@ set_target_properties(quest_parse PROPERTIES
) )
if (UNIX) if (UNIX)
target_link_libraries (quest_parse Common xivdat pthread mysqlclient dl z) target_link_libraries (quest_parse common xivdat pthread mysqlclient dl z)
else() else()
target_link_libraries (quest_parse Common xivdat libmysql zlib1) target_link_libraries (quest_parse common xivdat libmysql zlib1)
endif() endif()
target_link_libraries(quest_parse ${Boost_LIBRARIES} ${Boost_LIBRARIES}) target_link_libraries(quest_parse ${Boost_LIBRARIES} ${Boost_LIBRARIES})