diff options
| author | Brian <runningnak3d@gmail.com> | 2010-06-09 00:34:22 -0600 |
|---|---|---|
| committer | Brian <runningnak3d@gmail.com> | 2010-06-09 00:34:22 -0600 |
| commit | 02efe02b43a7ce192cb313586eb2cb9df220575e (patch) | |
| tree | d343a146caa6d4d8e2f48b315994ba215215965e /src/server | |
| parent | 9cf85c0549f4a636bfdfbb0270a5cdb765a443d6 (diff) | |
* Added missing include paths that got lost in the merge a few revs ago
* Fixed realative path to Reference.h
* Re-enabled PCH building by default
* Re-enabled scripts building by default
* Linux compile now fully functional again.
--HG--
branch : trunk
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/game/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/server/game/Combat/ThreatManager.h | 2 | ||||
| -rw-r--r-- | src/server/game/Grids/GridReference.h | 2 | ||||
| -rw-r--r-- | src/server/game/Groups/GroupReference.h | 2 | ||||
| -rw-r--r-- | src/server/worldserver/CMakeLists.txt | 1 |
5 files changed, 5 insertions, 3 deletions
diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt index 480f342aaa8..8ae179a3772 100644 --- a/src/server/game/CMakeLists.txt +++ b/src/server/game/CMakeLists.txt @@ -325,6 +325,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/server/shared ${CMAKE_SOURCE_DIR}/src/server/shared/Configuration ${CMAKE_SOURCE_DIR}/src/server/shared/Cryptography + ${CMAKE_SOURCE_DIR}/src/server/shared/Cryptography/Authentication ${CMAKE_SOURCE_DIR}/src/server/shared/Database ${CMAKE_SOURCE_DIR}/src/server/shared/DataStores ${CMAKE_SOURCE_DIR}/src/server/shared/Debugging diff --git a/src/server/game/Combat/ThreatManager.h b/src/server/game/Combat/ThreatManager.h index f0ae370907b..4834ba28759 100644 --- a/src/server/game/Combat/ThreatManager.h +++ b/src/server/game/Combat/ThreatManager.h @@ -23,7 +23,7 @@ #include "Common.h" #include "SharedDefines.h" -#include "Reference.h" +#include "LinkedReference/Reference.h" #include "UnitEvents.h" #include <list> diff --git a/src/server/game/Grids/GridReference.h b/src/server/game/Grids/GridReference.h index 63e3817c7d3..0f5b46b4950 100644 --- a/src/server/game/Grids/GridReference.h +++ b/src/server/game/Grids/GridReference.h @@ -21,7 +21,7 @@ #ifndef _GRIDREFERENCE_H #define _GRIDREFERENCE_H -#include "Reference.h" +#include "LinkedReference/Reference.h" template<class OBJECT> class GridRefManager; diff --git a/src/server/game/Groups/GroupReference.h b/src/server/game/Groups/GroupReference.h index d2c50688113..56dc5a3375f 100644 --- a/src/server/game/Groups/GroupReference.h +++ b/src/server/game/Groups/GroupReference.h @@ -21,7 +21,7 @@ #ifndef _GROUPREFERENCE_H #define _GROUPREFERENCE_H -#include "Reference.h" +#include "LinkedReference/Reference.h" class Group; class Player; diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt index 5c80dfc5773..969204f3522 100644 --- a/src/server/worldserver/CMakeLists.txt +++ b/src/server/worldserver/CMakeLists.txt @@ -24,6 +24,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/server/shared ${CMAKE_SOURCE_DIR}/src/server/shared/Configuration ${CMAKE_SOURCE_DIR}/src/server/shared/Cryptography + ${CMAKE_SOURCE_DIR}/src/server/shared/Cryptography/Authentication ${CMAKE_SOURCE_DIR}/src/server/shared/Database ${CMAKE_SOURCE_DIR}/src/server/shared/DataStores ${CMAKE_SOURCE_DIR}/src/server/shared/Debugging |