aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBrian <runningnak3d@gmail.com>2010-06-07 07:13:35 -0600
committerBrian <runningnak3d@gmail.com>2010-06-07 07:13:35 -0600
commitcbaf5587d62459df3ddd0a4312cb549649c30a4a (patch)
tree9764be2ea6911a01cec921ffbec506cae030dde0 /src
parentfcd58c134dc532a99dbc19a884b9f3aa9ec70b69 (diff)
* shared lib builds again under Linux.
--HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/server/collision/CMakeLists.txt4
-rw-r--r--src/server/shared/Configuration/Config.h2
-rw-r--r--src/server/shared/Database/Database.h2
-rw-r--r--src/server/shared/Debugging/MemoryLeaks.h2
-rw-r--r--src/server/shared/Dynamic/UnorderedMap.h4
-rw-r--r--src/server/shared/Logging/Log.cpp2
-rw-r--r--src/server/shared/Policies/CreationPolicy.h2
-rw-r--r--src/server/shared/Policies/ObjectLifeTime.h2
-rw-r--r--src/server/shared/Policies/ThreadingModel.h2
-rw-r--r--src/server/shared/Utilities/ProgressBar.h2
-rw-r--r--src/server/shared/Utilities/Timer.h2
11 files changed, 13 insertions, 13 deletions
diff --git a/src/server/collision/CMakeLists.txt b/src/server/collision/CMakeLists.txt
index e30b9a2bf36..e9fa25d8674 100644
--- a/src/server/collision/CMakeLists.txt
+++ b/src/server/collision/CMakeLists.txt
@@ -2,8 +2,8 @@
########### next target ###############
SET(collision_STAT_SRCS
- BIH.h
- BIH.cpp
+ BoundingIntervalHierarchy.h
+ BoundingIntervalHierarchy.cpp
Management/IVMapManager.h
Maps/MapTree.cpp
Maps/MapTree.h
diff --git a/src/server/shared/Configuration/Config.h b/src/server/shared/Configuration/Config.h
index ccc76073e46..bfcb324ee62 100644
--- a/src/server/shared/Configuration/Config.h
+++ b/src/server/shared/Configuration/Config.h
@@ -22,7 +22,7 @@
#define CONFIG_H
#include <Policies/Singleton.h>
-#include "Platform/Define.h"
+#include "Define.h"
class DOTCONFDocument;
diff --git a/src/server/shared/Database/Database.h b/src/server/shared/Database/Database.h
index 4ad5d29c993..f99f7c93c8f 100644
--- a/src/server/shared/Database/Database.h
+++ b/src/server/shared/Database/Database.h
@@ -22,7 +22,7 @@
#define DATABASE_H
#include "Threading.h"
-#include "Utilities/UnorderedMap.h"
+#include "Dynamic/UnorderedMap.h"
#include "Database/SqlDelayThread.h"
#include "Policies/Singleton.h"
#include "ace/Thread_Mutex.h"
diff --git a/src/server/shared/Debugging/MemoryLeaks.h b/src/server/shared/Debugging/MemoryLeaks.h
index c8b8fb8e1b1..bc722f241bd 100644
--- a/src/server/shared/Debugging/MemoryLeaks.h
+++ b/src/server/shared/Debugging/MemoryLeaks.h
@@ -19,7 +19,7 @@
#ifndef TRINITYSERVER_MEMORY_H
#define TRINITYSERVER_MEMORY_H
-#include "Platform/CompilerDefs.h"
+#include "shared/CompilerDefs.h"
#if COMPILER == COMPILER_MICROSOFT
diff --git a/src/server/shared/Dynamic/UnorderedMap.h b/src/server/shared/Dynamic/UnorderedMap.h
index fce5ec82bfc..fa87411258d 100644
--- a/src/server/shared/Dynamic/UnorderedMap.h
+++ b/src/server/shared/Dynamic/UnorderedMap.h
@@ -21,8 +21,8 @@
#ifndef TRINITY_UNORDERED_MAP_H
#define TRINITY_UNORDERED_MAP_H
-#include "Platform/CompilerDefs.h"
-#include "Platform/Define.h"
+#include "CompilerDefs.h"
+#include "Define.h"
#if COMPILER == COMPILER_INTEL
#include <ext/hash_map>
diff --git a/src/server/shared/Logging/Log.cpp b/src/server/shared/Logging/Log.cpp
index 187b9eaa79b..e701e073d5c 100644
--- a/src/server/shared/Logging/Log.cpp
+++ b/src/server/shared/Logging/Log.cpp
@@ -21,7 +21,7 @@
#include "Common.h"
#include "Log.h"
#include "Policies/SingletonImp.h"
-#include "Config/ConfigEnv.h"
+#include "Configuration/ConfigEnv.h"
#include "Util.h"
#include <stdarg.h>
diff --git a/src/server/shared/Policies/CreationPolicy.h b/src/server/shared/Policies/CreationPolicy.h
index 8552ce7da52..cc38d704e99 100644
--- a/src/server/shared/Policies/CreationPolicy.h
+++ b/src/server/shared/Policies/CreationPolicy.h
@@ -22,7 +22,7 @@
#define TRINITY_CREATIONPOLICY_H
#include <stdlib.h>
-#include "Platform/Define.h"
+#include "Define.h"
namespace Trinity
{
diff --git a/src/server/shared/Policies/ObjectLifeTime.h b/src/server/shared/Policies/ObjectLifeTime.h
index 61b90b59f6e..205434cb613 100644
--- a/src/server/shared/Policies/ObjectLifeTime.h
+++ b/src/server/shared/Policies/ObjectLifeTime.h
@@ -22,7 +22,7 @@
#define TRINITY_OBJECTLIFETIME_H
#include <stdexcept>
-#include "Platform/Define.h"
+#include "Define.h"
typedef void (* Destroyer)(void);
diff --git a/src/server/shared/Policies/ThreadingModel.h b/src/server/shared/Policies/ThreadingModel.h
index d4c5e9a2333..a792bf1b7d7 100644
--- a/src/server/shared/Policies/ThreadingModel.h
+++ b/src/server/shared/Policies/ThreadingModel.h
@@ -26,7 +26,7 @@
*
*/
-#include "Platform/Define.h"
+#include "Define.h"
namespace Trinity
{
diff --git a/src/server/shared/Utilities/ProgressBar.h b/src/server/shared/Utilities/ProgressBar.h
index e7565590278..cae23254f30 100644
--- a/src/server/shared/Utilities/ProgressBar.h
+++ b/src/server/shared/Utilities/ProgressBar.h
@@ -20,7 +20,7 @@
#ifndef TRINITYCORE_PROGRESSBAR_H
#define TRINITYCORE_PROGRESSBAR_H
-#include "Platform/Define.h"
+#include "Define.h"
class barGoLink
{
diff --git a/src/server/shared/Utilities/Timer.h b/src/server/shared/Utilities/Timer.h
index 3e0a369b655..ed78c1d42e7 100644
--- a/src/server/shared/Utilities/Timer.h
+++ b/src/server/shared/Utilities/Timer.h
@@ -21,7 +21,7 @@
#ifndef TRINITY_TIMER_H
#define TRINITY_TIMER_H
-#include "Platform/CompilerDefs.h"
+#include "shared/CompilerDefs.h"
#if PLATFORM == PLATFORM_WINDOWS
# include <ace/config-all.h>