3 files changed, 28 insertions, 62 deletions
diff --git a/src/server/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt
index e8c94866867..7b0ee197858 100644
--- a/src/server/authserver/CMakeLists.txt
+++ b/src/server/authserver/CMakeLists.txt
@@ -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
diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt
index 4a425642ad5..6549c6e91ad 100644
--- a/src/server/shared/CMakeLists.txt
+++ b/src/server/shared/CMakeLists.txt
@@ -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 )
diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt
index 280f3a469ac..d6b25c5e139 100644
--- a/src/server/worldserver/CMakeLists.txt
+++ b/src/server/worldserver/CMakeLists.txt
@@ -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