diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/mangosd/CMakeLists.txt | 53 | ||||
| -rw-r--r-- | src/realmd/CMakeLists.txt | 45 | ||||
| -rw-r--r-- | src/shared/SystemConfig.h | 2 | ||||
| -rw-r--r-- | src/shared/SystemConfig.h.in | 2 |
5 files changed, 101 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index fdad0628c75..551a8632948 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,7 +38,7 @@ EXECUTE_PROCESS( OUTPUT_VARIABLE HG_REVISION ) -message("* Trinity Core revision: ${HG_REVISION}") +message("* TrinityCore & MaNGOS revision: ${HG_REVISION}") IF (PREFIX) SET(CMAKE_INSTALL_PREFIX ${PREFIX}) diff --git a/src/mangosd/CMakeLists.txt b/src/mangosd/CMakeLists.txt new file mode 100644 index 00000000000..dc5941ef4e2 --- /dev/null +++ b/src/mangosd/CMakeLists.txt @@ -0,0 +1,53 @@ + +########### next target ############### + +SET(trinity-core_SRCS +CliRunnable.cpp +CliRunnable.h +Main.cpp +Master.cpp +Master.h +RASocket.cpp +RASocket.h +WorldRunnable.cpp +WorldRunnable.h +) + +add_executable(trinity-core ${trinity-core_SRCS}) +add_definitions( +-D_TRINITY_CORE_CONFIG='"${CONF_DIR}/trinitycore.conf"' +) +IF (DO_MYSQL) + SET_TARGET_PROPERTIES(trinity-core PROPERTIES LINK_FLAGS "-pthread") +ENDIF(DO_MYSQL) + + + +target_link_libraries( +trinity-core +game +shared +zlib +trinityframework +trinitysockets +trinitydatabase +trinityauth +trinityconfig +vmaps +ZThread +g3dlite +${SCRIPT_LIB} +${MYSQL_LIBRARIES} +${POSTGRE_LIBS} +${SSLLIB} +${ACE_LIBRARY} +${ZLIB} +) + +install(TARGETS trinity-core DESTINATION bin) + + +########### install files ############### + +install(FILES mangosd.conf.dist.in DESTINATION etc) + diff --git a/src/realmd/CMakeLists.txt b/src/realmd/CMakeLists.txt new file mode 100644 index 00000000000..ab03c3143a5 --- /dev/null +++ b/src/realmd/CMakeLists.txt @@ -0,0 +1,45 @@ +########### next target ############### + +SET(trinity-realm_SRCS +AuthCodes.h +AuthSocket.cpp +AuthSocket.h +Main.cpp +RealmList.cpp +RealmList.h +) + +add_executable(trinity-realm ${trinity-realm_SRCS}) +add_definitions( +-D_TRINITY_REALM_CONFIG='"${CONF_DIR}/trinityrealm.conf"' +) +IF (DO_MYSQL) + #SET_TARGET_PROPERTIES(mangos-realmd PROPERTIES LINK_FLAGS ${MYSQL_LIBS}) + SET_TARGET_PROPERTIES(trinity-realm PROPERTIES LINK_FLAGS "-pthread") +ENDIF(DO_MYSQL) +IF (DO_POSTGRE) + SET_TARGET_PROPERTIES(trinity-realmd PROPERTIES LINK_FLAGS ${POSTGRE_LIBS}) +ENDIF(DO_POSTGRE) + + +target_link_libraries( +trinity-realm +shared +trinityframework +trinitysockets +trinitydatabase +trinityauth +trinityconfig +ZThread +zlib +${SSLLIB} +${MYSQL_LIBRARIES} +) + +install(TARGETS trinity-realm DESTINATION bin) + + +########### install files ############### + +install(FILES realmd.conf.dist.in DESTINATION etc) + diff --git a/src/shared/SystemConfig.h b/src/shared/SystemConfig.h index 9e7fe3e3045..aa3f048d32f 100644 --- a/src/shared/SystemConfig.h +++ b/src/shared/SystemConfig.h @@ -28,7 +28,7 @@ #include "revision.h" -#define _PACKAGENAME "TrinityCore " +#define _PACKAGENAME "TC&MaNGOS " #define _CODENAME "YUME" #if TRINITY_ENDIAN == TRINITY_BIGENDIAN diff --git a/src/shared/SystemConfig.h.in b/src/shared/SystemConfig.h.in index 189a7270e1c..eecc5fecedf 100644 --- a/src/shared/SystemConfig.h.in +++ b/src/shared/SystemConfig.h.in @@ -23,7 +23,7 @@ #define TRINITY_SYSTEMCONFIG_H #ifndef _PACKAGENAME -#define _PACKAGENAME "Trinity" +#define _PACKAGENAME "TC&Mangos " #endif #include "Platform/Define.h" |