more cmake fixes. comment collision compilation until fixed

--HG--
branch : trunk

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 "Utilities/UnorderedMap.h"
-#include "BIH.h"
+#include "Define.h"
+#include "UnorderedMap.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
 {