aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorclick <none@none>2010-09-08 19:20:38 +0200
committerclick <none@none>2010-09-08 19:20:38 +0200
commit3b91ce95a64d5ed95b8a5ff3cd595c088df1eb75 (patch)
tree6be38071555710c4355104c2cd765c7b84987173 /src
parentf1159c2e99d76979718b650ec8789ef47a232292 (diff)
BuildSystem: Sort out issues with mysql-libraries under *nix (and should now also work properly for Win32)
- Rename the "EXTERNAL_MYSQL" flag to "USE_MYSQL_SOURCES" to reflect it's PROPER use (and ensure that it's ONLY used on Win32) - Remove a lingering "scripts" definition (the "scripts"-target is always included, but only from compiled parts (broke builds with -DSCRIPTS=0) --HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/server/worldserver/CMakeLists.txt8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt
index 7179c2f8c31..596ae87a977 100644
--- a/src/server/worldserver/CMakeLists.txt
+++ b/src/server/worldserver/CMakeLists.txt
@@ -157,21 +157,15 @@ endif()
set_target_properties(worldserver PROPERTIES LINK_FLAGS "${worldserver_LINK_FLAGS}")
-if( SCRIPTS )
- set(SCRIPT_LIB "scripts")
-else()
- set(SCRIPT_LIB "")
-endif()
-
target_link_libraries(worldserver
game
shared
+ scripts
trinitysockets
collision
g3dlib
gsoap
${JEMALLOC_LIB}
- ${SCRIPT_LIB}
${READLINE_LIBRARY}
${TERMCAP_LIBRARY}
${ACE_LIBRARY}