diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/server/collision/Maps/MapTree.h | 4 | ||||
| -rw-r--r-- | src/server/collision/Models/WorldModel.h | 2 | ||||
| -rw-r--r-- | src/server/worldserver/CMakeLists.txt | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt index ccf7b894eb4..1a6321c23e3 100644 --- a/src/server/CMakeLists.txt +++ b/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) diff --git a/src/server/collision/Maps/MapTree.h b/src/server/collision/Maps/MapTree.h index 282f34d42fd..7a7af43e949 100644 --- a/src/server/collision/Maps/MapTree.h +++ b/src/server/collision/Maps/MapTree.h @@ -20,8 +20,8 @@ #define _MAPTREE_H #include "Define.h" -#include "UnorderedMap.h" -#include "BoundingIntervalHierarchy.cpp" +#include "Dynamic/UnorderedMap.h" +#include "BoundingIntervalHierarchy.h" namespace VMAP { diff --git a/src/server/collision/Models/WorldModel.h b/src/server/collision/Models/WorldModel.h index b23f4ae3f00..7d5c921ef6e 100644 --- a/src/server/collision/Models/WorldModel.h +++ b/src/server/collision/Models/WorldModel.h @@ -23,7 +23,7 @@ #include <G3D/Vector3.h> #include <G3D/AABox.h> #include <G3D/Ray.h> -#include "BoundingIntervalHierarchy.cpp" +#include "BoundingIntervalHierarchy.h" #include "Define.h" diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt index 0cedd5da0ca..c908e6617f2 100644 --- a/src/server/worldserver/CMakeLists.txt +++ b/src/server/worldserver/CMakeLists.txt @@ -137,8 +137,6 @@ trinitydatabase trinityauth trinityconfig collision -g3dlite -jmalloc ${SCRIPT_LIB} ${READLINE_LIBRARY} ${TERMCAP_LIBRARY} |