From f213f2c7d9bdafece27e198ba0bdf74ec258ede6 Mon Sep 17 00:00:00 2001
From: click <none@none>
Date: Thu, 29 Jul 2010 21:08:16 +0200
Subject: Buildsystem/CMake: Include core/script headerfiles in generated
 MSVC-projects. - Still "work in progress", as in missing filters and MSVC
 folder layouts. - external libraries not fully "headerified" (not really
 required)

--HG--
branch : trunk
---
 src/server/worldserver/CMakeLists.txt | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

(limited to 'src/server/worldserver')

diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt
index 9237f59a102..8b36f80effe 100644
--- a/src/server/worldserver/CMakeLists.txt
+++ b/src/server/worldserver/CMakeLists.txt
@@ -8,17 +8,28 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-########### worldserver ###############
+file(GLOB_RECURSE sources_CommandLine CommandLine/*.cpp CommandLine/*.h)
+file(GLOB_RECURSE sources_RemoteAccess RemoteAccess/*.cpp RemoteAccess/*.h)
+file(GLOB_RECURSE sources_TCSoap TCSoap/*.cpp TCSoap/*.h)
+file(GLOB_RECURSE sources_WorldThread WorldThread/*.cpp WorldThread/*.h)
 
 set(worldserver_SRCS
-  CommandLine/CliRunnable.cpp
-  RemoteAccess/RASocket.cpp
-  TCSoap/TCSoap.cpp
-  WorldThread/WorldRunnable.cpp
+  ${sources_CommandLine}
+  ${sources_RemoteAccess}
+  ${sources_TCSoap}
+  ${sources_WorldThread}
   Main.cpp
   Master.cpp
+  Master.h
 )
 
+if( WIN32 )
+  set(worldserver_SRCS
+    ${worldserver_SRCS}
+    worldserver.rc
+  )
+endif()
+
 include_directories(
   ${ACE_INCLUDE_DIR}
   ${MYSQL_INCLUDE_DIR}
@@ -152,14 +163,11 @@ if( WIN32 )
     shared
     zlib
     trinitysockets
-    trinitydatabase
-    trinityauth
-    trinityconfig
     collision
     g3dlib
     gsoap
-    ${SCRIPT_LIB}
     ace
+    ${SCRIPT_LIB}
     ${MYSQL_LIBRARY}
     ${OPENSSL_LIBRARIES}
     ${OPENSSL_EXTRA_LIBRARIES}
@@ -170,9 +178,6 @@ else()
     game
     shared
     trinitysockets
-    trinitydatabase
-    trinityauth
-    trinityconfig
     collision
     g3dlib
     gsoap
-- 
cgit v1.2.3