diff options
| author | Tartalo <none@none> | 2010-06-08 01:20:06 +0200 |
|---|---|---|
| committer | Tartalo <none@none> | 2010-06-08 01:20:06 +0200 |
| commit | a5f4e3de948f388505b7a6d1baf107ceacfd718b (patch) | |
| tree | 45a9704d7fbe5f0fc3e891b5601ff5602e77f86e /src/server/collision | |
| parent | 498f62f4cc0c5f8464a94492a26f6d17d6609b58 (diff) | |
more cmake fixes. comment collision compilation until fixed
--HG--
branch : trunk
Diffstat (limited to 'src/server/collision')
| -rw-r--r-- | src/server/collision/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/server/collision/Maps/MapTree.h | 6 | ||||
| -rw-r--r-- | src/server/collision/Models/ModelInstance.h | 2 | ||||
| -rw-r--r-- | src/server/collision/Models/WorldModel.h | 4 |
4 files changed, 11 insertions, 7 deletions
diff --git a/src/server/collision/CMakeLists.txt b/src/server/collision/CMakeLists.txt index b9d7d420d5d..a67cd8d660a 100644 --- a/src/server/collision/CMakeLists.txt +++ b/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}) diff --git a/src/server/collision/Maps/MapTree.h b/src/server/collision/Maps/MapTree.h index 7955cb92d68..282f34d42fd 100644 --- a/src/server/collision/Maps/MapTree.h +++ b/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 { diff --git a/src/server/collision/Models/ModelInstance.h b/src/server/collision/Models/ModelInstance.h index 97b3ab632a1..42b92c8fb89 100644 --- a/src/server/collision/Models/ModelInstance.h +++ b/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 { diff --git a/src/server/collision/Models/WorldModel.h b/src/server/collision/Models/WorldModel.h index f12efed4f5d..b23f4ae3f00 100644 --- a/src/server/collision/Models/WorldModel.h +++ b/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 { |