diff options
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -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 |
6 files changed, 7 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8eab43b34f4..fab32d81ab6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,9 +33,9 @@ option(CENTOS "CENTOS" 0) option(DO_CLI "With CLI" 1) option(DO_DEBUG "Debug mode" 0) option(DO_MYSQL "With MySQL support" 1) -option(DO_PCH "Use precompiled headers" 0) +option(DO_PCH "Use precompiled headers" 1) option(DO_RA "With RA" 0) -option(DO_SCRIPTS "With trinityscripts" 0) +option(DO_SCRIPTS "With trinityscripts" 1) option(DO_SQL "Copy SQL files" 0) option(DO_TOOLS "Compile tools" 0) option(DO_WARN "Enable all compile warnings" 0) 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 |