More cmake fixes. Now cmake runs without errors with -DO_SCRIPTS=0

--HG--
branch : trunk

src/server/authserver/CMakeLists.txt

@@ -1,16 +1,16 @@
 ########### next target ###############
 
 SET(trinity-realm_SRCS
-AuthCodes.cpp
-AuthCodes.h
-AuthSocket.cpp
-AuthSocket.h
+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
-RealmList.cpp
-RealmList.h
-RealmSocket.h
-RealmSocket.cpp
-RealmAcceptor.h
 )
 
 include_directories(

src/server/game/CMakeLists.txt

@@ -372,8 +372,6 @@ if(NOT DO_SCRIPTS)
    SET(game_STAT_SRCS ${game_STAT_SRCS}
       AI/ScriptedAI/ScriptedEscortAI.cpp
       AI/ScriptedAI/ScriptedEscortAI.h
-      ScriptMgr/ScriptedPch.cpp
-      ScriptMgr/ScriptedPch.h
       AI/ScriptedAI/ScriptedCreature.cpp
       AI/ScriptedAI/ScriptedCreature.h
       AI/ScriptedAI/ScriptedFollowerAI.cpp
@@ -384,6 +382,8 @@ if(NOT DO_SCRIPTS)
       AI/ScriptedAI/ScriptedInstance.h
       AI/ScriptedAI/ScriptedSimpleAI.cpp
       AI/ScriptedAI/ScriptedSimpleAI.h
+      PrecompiledHeaders/ScriptPCH.cpp
+      PrecompiledHeaders/ScriptPCH.h
    )
    message("-- Added Script Engine to GAME lib")
 endif(NOT DO_SCRIPTS)
@@ -393,6 +393,6 @@ ADD_DEPENDENCIES(game revision.h)
 
 # Generate precompiled header
 IF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
-        ADD_PRECOMPILED_HEADER(game ${CMAKE_SOURCE_DIR}/src/server/game/PrecompiledHeaders/pchlinux.h)
+        ADD_PRECOMPILED_HEADER(game ${CMAKE_SOURCE_DIR}/src/server/game/PrecompiledHeaders/NixCorePCH.h)
 ENDIF(DO_PCH AND CMAKE_COMPILER_IS_GNUCXX)
 

src/server/shared/CMakeLists.txt

@@ -13,22 +13,22 @@ add_subdirectory(Utilities)
 ########### next target ###############
 
 SET(shared_STAT_SRCS
-   ByteBuffer.h
+   Debugging/Errors.h
+   Logging/Log.cpp
+   Logging/Log.h
+   Packets/ByteBuffer.h
+   Packets/WorldPacket.h
+   Threading/DelayExecutor.cpp
+   Threading/DelayExecutor.h
+   Threading/Threading.cpp
+   Utilities/ProgressBar.cpp
+   Utilities/ProgressBar.h
+   Utilities/SignalHandler.h
+   Utilities/Timer.h
+   Utilities/Util.cpp
+   Utilities/Util.h
    Common.cpp
    Common.h
-   DelayExecutor.cpp
-   DelayExecutor.h
-   Errors.h
-   Log.cpp
-   Log.h
-   ProgressBar.cpp
-   ProgressBar.h
-   SignalHandler.h
-   Threading.cpp
-   Timer.h
-   Util.cpp
-   Util.h
-   WorldPacket.h
    SystemConfig.h
 )
 

src/server/shared/Cryptography/CMakeLists.txt

@@ -2,25 +2,24 @@
 ########### next target ###############
 
 SET(trinityauth_STAT_SRCS
-   AuthCrypt.cpp
-   AuthCrypt.h
+   Authentication/AuthCrypt.cpp
+   Authentication/AuthCrypt.h
    BigNumber.cpp
    BigNumber.h
-   Hmac.cpp
-   Hmac.h
-   Sha1.cpp
-   Sha1.h
-   md5.c
-   md5.h
-   SARC4.cpp
-   SARC4.h
+   HMACSHA1.cpp
+   HMACSHA1.h
+   SHA1.cpp
+   SHA1.h
+   MD5.c
+   MD5.h
+   ARC4.cpp
+   ARC4.h
 )
 
 include_directories(
   ${ACE_INCLUDE_DIR}
   ${CMAKE_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}/src/server/shared
-  ${CMAKE_SOURCE_DIR}/src/server/framework
   ${MYSQL_INCLUDE_DIR}
 )
 

src/server/shared/Database/CMakeLists.txt

@@ -1,7 +1,7 @@
 SET(trinitydatabase_STAT_SRCS
-    DBCFileLoader.cpp
-    DBCFileLoader.h
-    DBCStore.h
+    ../DataStores/DBCFileLoader.cpp
+    ../DataStores/DBCFileLoader.h
+    ../DataStores/DBCStore.h
     Database.cpp
     Database.h
     DatabaseEnv.h   
@@ -23,7 +23,6 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}/src/server/shared
   ${CMAKE_SOURCE_DIR}/src/server/shared/Database
-  ${CMAKE_SOURCE_DIR}/src/server/framework
   ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object
   ${MYSQL_INCLUDE_DIR}
 )

src/server/worldserver/CMakeLists.txt

@@ -2,15 +2,15 @@
 ########### next target ###############
 
 SET(trinity-core_SRCS
-CliRunnable.cpp
-CliRunnable.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
-RASocket.cpp
-RASocket.h
-WorldRunnable.cpp
-WorldRunnable.h
 )
 
 include_directories(
@@ -19,8 +19,6 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/dep/include
   ${CMAKE_SOURCE_DIR}/src/server/shared
   ${CMAKE_SOURCE_DIR}/src/server/shared/Database
-  ${CMAKE_SOURCE_DIR}/src/server/shared/vmap
-  ${CMAKE_SOURCE_DIR}/src/server/framework
   ${CMAKE_SOURCE_DIR}/src/server/game
   ${CMAKE_SOURCE_DIR}/src/server/game/Account
   ${CMAKE_SOURCE_DIR}/src/server/game/Achievements