aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorXanadu <none@none>2010-06-19 21:50:34 +0200
committerXanadu <none@none>2010-06-19 21:50:34 +0200
commit09923bde0638fd1987bc46d01ae3f0089316ba18 (patch)
tree3d9c3f715261ab7c8e8fea8afc1334548415a4cd /src
parent29d9e40f7482ff5b5b0944a339fcf7b89464bf2d (diff)
Fixed win build of vmap assembler, too.
--HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/server/collision/Management/VMapManager2.cpp1
-rw-r--r--src/server/collision/Maps/MapTree.h1
-rw-r--r--src/tools/vmap3_assembler/CMakeLists.txt1
3 files changed, 1 insertions, 2 deletions
diff --git a/src/server/collision/Management/VMapManager2.cpp b/src/server/collision/Management/VMapManager2.cpp
index 8e3681864d0..79d0b57790a 100644
--- a/src/server/collision/Management/VMapManager2.cpp
+++ b/src/server/collision/Management/VMapManager2.cpp
@@ -25,6 +25,7 @@
#include "ModelInstance.h"
#include "WorldModel.h"
#include "VMapDefinitions.h"
+#include "Log.h"
using G3D::Vector3;
diff --git a/src/server/collision/Maps/MapTree.h b/src/server/collision/Maps/MapTree.h
index f9c51d47b95..7a7af43e949 100644
--- a/src/server/collision/Maps/MapTree.h
+++ b/src/server/collision/Maps/MapTree.h
@@ -22,7 +22,6 @@
#include "Define.h"
#include "Dynamic/UnorderedMap.h"
#include "BoundingIntervalHierarchy.h"
-#include "Log.h"
namespace VMAP
{
diff --git a/src/tools/vmap3_assembler/CMakeLists.txt b/src/tools/vmap3_assembler/CMakeLists.txt
index 8c79fff6804..4b86c1ffa16 100644
--- a/src/tools/vmap3_assembler/CMakeLists.txt
+++ b/src/tools/vmap3_assembler/CMakeLists.txt
@@ -13,7 +13,6 @@ include_directories(
${CMAKE_SOURCE_DIR}/externals/g3dlite
${CMAKE_SOURCE_DIR}/src/server/shared
${CMAKE_SOURCE_DIR}/src/server/shared/Debugging
- ${CMAKE_SOURCE_DIR}/src/server/shared/Logging
${CMAKE_SOURCE_DIR}/src/server/collision/Maps
${CMAKE_SOURCE_DIR}/src/server/collision/Models
${ACE_INCLUDE_DIR}