diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/authserver/CMakeLists.txt | 44 | ||||
| -rw-r--r-- | src/server/worldserver/CMakeLists.txt | 70 |
2 files changed, 57 insertions, 57 deletions
diff --git a/src/server/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt index 0e15381424f..c3f5fe6331b 100644 --- a/src/server/authserver/CMakeLists.txt +++ b/src/server/authserver/CMakeLists.txt @@ -11,20 +11,22 @@ ########### authserver ############### SET(authserver_SRCS -Authentication/AuthCodes.cpp -Authentication/AuthCodes.h -Realms/RealmList.cpp -Realms/RealmList.h -Server/AuthSocket.cpp -Server/AuthSocket.h -Server/RealmSocket.h -Server/RealmSocket.cpp -Server/RealmAcceptor.h -Main.cpp + Authentication/AuthCodes.cpp + Authentication/AuthCodes.h + Realms/RealmList.cpp + Realms/RealmList.h + Server/AuthSocket.cpp + Server/AuthSocket.h + Server/RealmSocket.h + Server/RealmSocket.cpp + Server/RealmAcceptor.h + Main.cpp ) include_directories( ${ACE_INCLUDE_DIR} + ${MYSQL_INCLUDE_DIR} + ${OPENSSL_INCLUDE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/src/server/shared ${CMAKE_SOURCE_DIR}/src/server/shared/Database @@ -37,38 +39,36 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/server/authserver/Authentication ${CMAKE_SOURCE_DIR}/src/server/authserver/Realms ${CMAKE_SOURCE_DIR}/src/server/authserver/Server - ${MYSQL_INCLUDE_DIR} ) SET(authserver_LINK_FLAGS "") add_executable(authserver ${authserver_SRCS}) add_definitions( --D_TRINITY_REALM_CONFIG='"${CONF_DIR}/authserver.conf"' + -D_TRINITY_REALM_CONFIG='"${CONF_DIR}/authserver.conf"' ) SET(trinity-realm_LINK_FLAGS "-pthread ${authserver_LINK_FLAGS}") IF (CMAKE_SYSTEM_NAME MATCHES "Darwin") - SET(authserver_LINK_FLAGS "-framework Carbon ${authserver_LINK_FLAGS}") + SET(authserver_LINK_FLAGS "-framework Carbon ${authserver_LINK_FLAGS}") ENDIF (CMAKE_SYSTEM_NAME MATCHES "Darwin") SET_TARGET_PROPERTIES(authserver PROPERTIES LINK_FLAGS "${authserver_LINK_FLAGS}") target_link_libraries( -authserver -shared -trinitydatabase -trinityauth -trinityconfig -${SSLLIB} -${MYSQL_LIBRARIES} -${OSX_LIBS} + authserver + shared + trinitydatabase + trinityauth + trinityconfig + ${MYSQL_LIBRARY} + ${OPENSSL_LIBRARIES} + ${OSX_LIBS} ) install(TARGETS authserver DESTINATION bin) - ########### install files ############### install(FILES authserver.conf.dist DESTINATION etc) diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt index a47555307e7..6b496aa7794 100644 --- a/src/server/worldserver/CMakeLists.txt +++ b/src/server/worldserver/CMakeLists.txt @@ -11,19 +11,21 @@ ########### worldserver ############### SET(worldserver_SRCS -CommandLine/CliRunnable.cpp -CommandLine/CliRunnable.h -RemoteAccess/RASocket.cpp -RemoteAccess/RASocket.h -WorldThread/WorldRunnable.cpp -WorldThread/WorldRunnable.h -Main.cpp -Master.cpp -Master.h + CommandLine/CliRunnable.cpp + CommandLine/CliRunnable.h + RemoteAccess/RASocket.cpp + RemoteAccess/RASocket.h + WorldThread/WorldRunnable.cpp + WorldThread/WorldRunnable.h + Main.cpp + Master.cpp + Master.h ) include_directories( ${ACE_INCLUDE_DIR} + ${MYSQL_INCLUDE_DIR} + ${OPENSSL_INCLUDE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/externals/sockets/include ${CMAKE_SOURCE_DIR}/externals/mersennetwister @@ -115,56 +117,54 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/server/worldserver/CommandLine ${CMAKE_SOURCE_DIR}/src/server/worldserver/RemoteAccess ${CMAKE_SOURCE_DIR}/src/server/worldserver/WorldThread - ${MYSQL_INCLUDE_DIR} ) SET(worldserver_LINK_FLAGS "") add_executable(worldserver ${worldserver_SRCS}) add_definitions( --D_TRINITY_CORE_CONFIG='"${CONF_DIR}/worldserver.conf"' + -D_TRINITY_CORE_CONFIG='"${CONF_DIR}/worldserver.conf"' ) SET(worldserver_LINK_FLAGS "-pthread ${worldserver_LINK_FLAGS}") IF (CMAKE_SYSTEM_NAME MATCHES "Darwin") - SET(worldserver_LINK_FLAGS "-framework Carbon ${worldserver_LINK_FLAGS}") - SET(SCRIPT_LIB "") + SET(worldserver_LINK_FLAGS "-framework Carbon ${worldserver_LINK_FLAGS}") + SET(SCRIPT_LIB "") ENDIF (CMAKE_SYSTEM_NAME MATCHES "Darwin") SET_TARGET_PROPERTIES(worldserver PROPERTIES LINK_FLAGS "${worldserver_LINK_FLAGS}") if(DO_SCRIPTS) - SET(SCRIPT_LIB "scripts") + SET(SCRIPT_LIB "scripts") else(DO_SCRIPTS) - SET(SCRIPT_LIB "") + SET(SCRIPT_LIB "") endif(DO_SCRIPTS) target_link_libraries( -worldserver -game -shared -zlib -trinitysockets -trinitydatabase -trinityauth -trinityconfig -collision -g3dlib -jemalloc -${SCRIPT_LIB} -${READLINE_LIBRARY} -${TERMCAP_LIBRARY} -${MYSQL_LIBRARIES} -${SSLLIB} -${ACE_LIBRARY} -${ZLIB} -${OSX_LIBS} + worldserver + game + shared + zlib + trinitysockets + trinitydatabase + trinityauth + trinityconfig + collision + g3dlib + jemalloc + ${SCRIPT_LIB} + ${READLINE_LIBRARY} + ${TERMCAP_LIBRARY} + ${ACE_LIBRARY} + ${MYSQL_LIBRARY} + ${OPENSSL_LIBRARIES} + ${ZLIB} + ${OSX_LIBS} ) install(TARGETS worldserver DESTINATION bin) - ########### install files ############### install(FILES worldserver.conf.dist DESTINATION etc) |