Buildsystem: Clean up target link-definitions a bit
--HG-- branch : trunk
This commit is contained in:
@@ -84,23 +84,13 @@ endif()
|
||||
|
||||
set_target_properties(authserver PROPERTIES LINK_FLAGS "${authserver_LINK_FLAGS}")
|
||||
|
||||
if( WIN32 )
|
||||
target_link_libraries(
|
||||
authserver
|
||||
shared
|
||||
${MYSQL_LIBRARY}
|
||||
${OPENSSL_LIBRARIES}
|
||||
${OPENSSL_EXTRA_LIBRARIES}
|
||||
)
|
||||
else()
|
||||
target_link_libraries(
|
||||
authserver
|
||||
shared
|
||||
${MYSQL_LIBRARY}
|
||||
${OPENSSL_LIBRARIES}
|
||||
${OSX_LIBS}
|
||||
)
|
||||
endif()
|
||||
target_link_libraries(authserver
|
||||
shared
|
||||
${MYSQL_LIBRARY}
|
||||
${OPENSSL_LIBRARIES}
|
||||
${OPENSSL_EXTRA_LIBRARIES}
|
||||
${OSX_LIBS}
|
||||
)
|
||||
|
||||
if( WIN32 )
|
||||
add_custom_command(TARGET authserver
|
||||
|
||||
@@ -78,15 +78,9 @@ add_library(shared STATIC ${shared_STAT_SRCS})
|
||||
|
||||
add_dependencies(shared genrev)
|
||||
|
||||
if(WIN32)
|
||||
target_link_libraries(shared
|
||||
ace
|
||||
)
|
||||
else()
|
||||
target_link_libraries(shared
|
||||
${ACE_LIBRARY}
|
||||
)
|
||||
endif()
|
||||
target_link_libraries(shared
|
||||
${ACE_LIBRARY}
|
||||
)
|
||||
|
||||
# Generate precompiled header
|
||||
if( USE_COREPCH )
|
||||
|
||||
@@ -167,42 +167,24 @@ else()
|
||||
set(SCRIPT_LIB "")
|
||||
endif()
|
||||
|
||||
if( WIN32 )
|
||||
target_link_libraries(
|
||||
worldserver
|
||||
game
|
||||
shared
|
||||
zlib
|
||||
trinitysockets
|
||||
collision
|
||||
g3dlib
|
||||
gsoap
|
||||
ace
|
||||
${SCRIPT_LIB}
|
||||
${MYSQL_LIBRARY}
|
||||
${OPENSSL_LIBRARIES}
|
||||
${OPENSSL_EXTRA_LIBRARIES}
|
||||
)
|
||||
else()
|
||||
target_link_libraries(
|
||||
worldserver
|
||||
game
|
||||
shared
|
||||
trinitysockets
|
||||
collision
|
||||
g3dlib
|
||||
gsoap
|
||||
${JEMALLOC_LIB}
|
||||
${SCRIPT_LIB}
|
||||
${READLINE_LIBRARY}
|
||||
${TERMCAP_LIBRARY}
|
||||
${ACE_LIBRARY}
|
||||
${MYSQL_LIBRARY}
|
||||
${OPENSSL_LIBRARIES}
|
||||
${ZLIB_LIBRARIES}
|
||||
${OSX_LIBS}
|
||||
)
|
||||
endif()
|
||||
target_link_libraries(worldserver
|
||||
game
|
||||
shared
|
||||
trinitysockets
|
||||
collision
|
||||
g3dlib
|
||||
gsoap
|
||||
${JEMALLOC_LIB}
|
||||
${SCRIPT_LIB}
|
||||
${READLINE_LIBRARY}
|
||||
${TERMCAP_LIBRARY}
|
||||
${ACE_LIBRARY}
|
||||
${MYSQL_LIBRARY}
|
||||
${OPENSSL_LIBRARIES}
|
||||
${OPENSSL_EXTRA_LIBRARIES}
|
||||
${ZLIB_LIBRARIES}
|
||||
${OSX_LIBS}
|
||||
)
|
||||
|
||||
if( WIN32 )
|
||||
add_custom_command(TARGET worldserver
|
||||
|
||||
Reference in New Issue
Block a user