mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-30 08:07:46 +00:00
Code Activity

Some linker reorg

Browse source
This commit is contained in:
root 2018-09-24 09:03:29 -04:00
parent 02de786f60
commit b89402e109
6 changed files with 10 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/common/CMakeLists.txt
View file

@ -27,14 +27,13 @@ set_target_properties( common PROPERTIES
RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_CURRENT_SOURCE_DIR}/../../bin/" RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_CURRENT_SOURCE_DIR}/../../bin/"
RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_CURRENT_SOURCE_DIR}/../../bin/" RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_CURRENT_SOURCE_DIR}/../../bin/"
) )
target_link_libraries( common PUBLIC ${Boost_LIBRARIES} )
target_link_libraries( common PUBLIC xivdat ) target_link_libraries( common PUBLIC xivdat )
target_link_libraries( common PUBLIC mysqlConnector ) target_link_libraries( common PUBLIC mysqlConnector )
if( UNIX ) if( UNIX )
target_link_libraries( common PUBLIC mysqlclient pthread ) target_link_libraries( common PUBLIC pthread )
else()
target_link_libraries( common PUBLIC libmysql )
endif() endif()
target_include_directories( common PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/" ) target_include_directories( common PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/" )

2
src/servers/Scripts/ScriptObject.h
View file

@ -1,7 +1,7 @@
#ifndef SAPPHIRE_SCRIPTOBJECT_H #ifndef SAPPHIRE_SCRIPTOBJECT_H
#define SAPPHIRE_SCRIPTOBJECT_H #define SAPPHIRE_SCRIPTOBJECT_H
#include <Forwards.h> #include <ForwardsZone.h>
#include <Script/NativeScriptApi.h> #include <Script/NativeScriptApi.h>
#include <Event/EventDefs.h> #include <Event/EventDefs.h>

9
src/servers/sapphire_lobby/CMakeLists.txt
View file

@ -19,11 +19,6 @@ set_target_properties(sapphire_lobby PROPERTIES
VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/" VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/"
) )
if (UNIX) target_link_libraries(sapphire_lobby PRIVATE common)
target_link_libraries(sapphire_lobby common pthread dl z)
else()
target_link_libraries(sapphire_lobby common zlib1)
endif()
target_link_libraries(sapphire_lobby ${Boost_LIBRARIES} ${Boost_LIBRARIES}) cotire( sapphire_lobby )
cotire( sapphire_lobby )

2
src/servers/sapphire_zone/Actor/Player.h
View file

@ -1,7 +1,7 @@
#ifndef _PLAYER_H #ifndef _PLAYER_H
#define _PLAYER_H #define _PLAYER_H
#include "Forwards.h" #include "ForwardsZone.h"
#include <Common.h> #include <Common.h>
#include <Util/SpawnIndexAllocator.h> #include <Util/SpawnIndexAllocator.h>

13
src/servers/sapphire_zone/CMakeLists.txt
View file

@ -35,19 +35,10 @@ set_target_properties(sapphire_zone PROPERTIES
VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/" VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/"
) )
target_link_libraries( sapphire_zone common ) target_link_libraries( sapphire_zone PUBLIC common )
if (UNIX)
target_link_libraries( sapphire_zone pthread )
target_link_libraries( sapphire_zone dl )
target_link_libraries( sapphire_zone z )
else()
target_link_libraries( sapphire_zone zlib1 )
endif()
target_link_libraries( sapphire_zone ${Boost_LIBRARIES} )
target_include_directories( sapphire_zone PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" ) target_include_directories( sapphire_zone PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" )
if (UNIX) if (UNIX)
cotire( sapphire_zone ) cotire( sapphire_zone )
endif() endif()

2
src/servers/sapphire_zone/Script/NativeScriptApi.h
View file

@ -5,7 +5,7 @@
#include <typeinfo> #include <typeinfo>
#include <typeindex> #include <typeindex>
#include <Event/EventHandler.h> #include <Event/EventHandler.h>
#include "Forwards.h" #include "ForwardsZone.h"
#ifdef _MSC_VER #ifdef _MSC_VER
#define EXPORT __declspec( dllexport ) #define EXPORT __declspec( dllexport )