more cmake fixes. comment collision compilation until fixed

--HG--
branch : trunk

src/server/CMakeLists.txt

@@ -1,6 +1,6 @@
 add_subdirectory(shared)
 add_subdirectory(game)
-add_subdirectory(collision)
+#add_subdirectory(collision)
 if (DO_SCRIPTS)
    add_subdirectory(scripts)
 endif (DO_SCRIPTS)

src/server/authserver/CMakeLists.txt

@@ -18,7 +18,15 @@ 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/shared/Packets
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Cryptography
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Cryptography/Authentication
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Logging
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Utilities
+  ${CMAKE_SOURCE_DIR}/src/server/authserver
+  ${CMAKE_SOURCE_DIR}/src/server/authserver/Authentication
+  ${CMAKE_SOURCE_DIR}/src/server/authserver/Realms
+  ${CMAKE_SOURCE_DIR}/src/server/authserver/Server
   ${MYSQL_INCLUDE_DIR}
 )
 
@@ -41,12 +49,9 @@ SET_TARGET_PROPERTIES(trinity-realm PROPERTIES LINK_FLAGS "${trinity-realm_LINK_
 target_link_libraries(
 trinity-realm
 shared
-trinityframework
-trinitysockets
 trinitydatabase
 trinityauth
 trinityconfig
-zlib
 ${SSLLIB}
 ${MYSQL_LIBRARIES}
 ${OSX_LIBS}

src/server/authserver/Main.cpp

@@ -25,7 +25,7 @@
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
 
-#include "Config/ConfigEnv.h"
+#include "Configuration/ConfigEnv.h"
 #include "Log.h"
 #include "SystemConfig.h"
 #include "Util.h"

src/server/authserver/Server/AuthSocket.cpp

@@ -25,13 +25,13 @@
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
 #include "ByteBuffer.h"
-#include "Config/ConfigEnv.h"
+#include "Configuration/ConfigEnv.h"
 #include "Log.h"
 #include "RealmList.h"
 #include "AuthSocket.h"
 #include "AuthCodes.h"
 #include <openssl/md5.h>
-#include "Auth/Sha1.h"
+#include "SHA1.h"
 //#include "Util.h" -- for commented utf8ToUpperOnlyLatin
 
 extern DatabaseType LoginDatabase;

src/server/authserver/Server/AuthSocket.h

@@ -26,7 +26,7 @@
 #define _AUTHSOCKET_H
 
 #include "Common.h"
-#include "Auth/BigNumber.h"
+#include "BigNumber.h"
 
 #include "RealmSocket.h"
 

src/server/collision/CMakeLists.txt

@@ -1,5 +1,5 @@
 
-########### next target ###############
+########### collision ###############
 
 SET(collision_STAT_SRCS
    BoundingIntervalHierarchy.h
@@ -27,6 +27,10 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/externals/g3dlite/G3D.lib
   ${CMAKE_SOURCE_DIR}/externals/g3dlite/G3D.lib/include
   ${CMAKE_SOURCE_DIR}/externals/g3dlite/G3D.lib/include/G3D
+  ${CMAKE_SOURCE_DIR}/src/server/shared
+  ${CMAKE_SOURCE_DIR}/src/server/shared/Dynamic
+  ${CMAKE_SOURCE_DIR}/src/server/collision
+  ${CMAKE_SOURCE_DIR}/src/server/collision/Maps
 )
 
 add_library(collision STATIC ${collision_STAT_SRCS})

src/server/collision/Maps/MapTree.h

@@ -19,9 +19,9 @@
 #ifndef _MAPTREE_H
 #define _MAPTREE_H
 
-#include "Platform/Define.h"
+#include "Define.h"
-#include "Utilities/UnorderedMap.h"
+#include "UnorderedMap.h"
-#include "BIH.h"
+#include "BoundingIntervalHierarchy.cpp"
 
 namespace VMAP
 {

src/server/collision/Models/ModelInstance.h

@@ -24,7 +24,7 @@
 #include <G3D/AABox.h>
 #include <G3D/Ray.h>
 
-#include "Platform/Define.h"
+#include "Define.h"
 
 namespace VMAP
 {

src/server/collision/Models/WorldModel.h

@@ -23,9 +23,9 @@
 #include <G3D/Vector3.h>
 #include <G3D/AABox.h>
 #include <G3D/Ray.h>
-#include "BIH.h"
+#include "BoundingIntervalHierarchy.cpp"
 
-#include "Platform/Define.h"
+#include "Define.h"
 
 namespace VMAP
 {

src/server/shared/CMakeLists.txt

@@ -6,6 +6,7 @@ SET(shared_STAT_SRCS
    Logging/Log.h
    Packets/ByteBuffer.h
    Packets/WorldPacket.h
+   Policies/ObjectLifeTime.cpp
    Threading/DelayExecutor.cpp
    Threading/DelayExecutor.h
    Threading/Threading.cpp