diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/authserver/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/server/collision/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/server/game/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/server/game/DataStores/DBCfmt.h | 2 | ||||
| -rw-r--r-- | src/server/game/Scripting/ScriptMgr.h | 2 | ||||
| -rw-r--r-- | src/server/scripts/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/server/shared/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/server/shared/Define.h | 5 | ||||
| -rw-r--r-- | src/server/worldserver/CMakeLists.txt | 1 |
9 files changed, 13 insertions, 2 deletions
diff --git a/src/server/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt index d7f1eb4fa30..b40b8c906f4 100644 --- a/src/server/authserver/CMakeLists.txt +++ b/src/server/authserver/CMakeLists.txt @@ -60,6 +60,7 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/Server ${MYSQL_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR} + ${VALGRIND_INCLUDE_DIR} ) add_executable(authserver diff --git a/src/server/collision/CMakeLists.txt b/src/server/collision/CMakeLists.txt index 378bd62a78a..1c5fcbee52e 100644 --- a/src/server/collision/CMakeLists.txt +++ b/src/server/collision/CMakeLists.txt @@ -76,6 +76,7 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/Maps ${CMAKE_CURRENT_SOURCE_DIR}/Models ${MYSQL_INCLUDE_DIR} + ${VALGRIND_INCLUDE_DIR} ) add_library(collision STATIC diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt index 1403049f6a0..0d1b460500e 100644 --- a/src/server/game/CMakeLists.txt +++ b/src/server/game/CMakeLists.txt @@ -204,6 +204,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/server/scripts/PrecompiledHeaders ${MYSQL_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR} + ${VALGRIND_INCLUDE_DIR} ) add_library(game STATIC diff --git a/src/server/game/DataStores/DBCfmt.h b/src/server/game/DataStores/DBCfmt.h index e413828f286..3c2344c1d47 100644 --- a/src/server/game/DataStores/DBCfmt.h +++ b/src/server/game/DataStores/DBCfmt.h @@ -134,7 +134,7 @@ const std::string CustomSpellDifficultyIndex = "id"; char const SpellDurationfmt[] = "niii"; // 0 10 20 26 char const SpellEffectEntryfmt[] = "nifiiiffiiiiiifiifiiiiiiiix"; -const std::string CustomSpellEffectEntryfmt = "ppppppppppapppappppppppppp"; +const std::string CustomSpellEffectEntryfmt = "ppppppppppppppappppppppppp"; const std::string CustomSpellEffectEntryIndex = "Id"; // 0 10 20 30 40 47 char const SpellEntryfmt[] = "niiiiiiiiiiiiiiifiiiissxxiixxifiiiiiiixiiiiiiiix"; diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index 5d63844d946..0f670c3286a 100644 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -19,8 +19,8 @@ #ifndef SC_SCRIPTMGR_H #define SC_SCRIPTMGR_H -#include <atomic> #include "Common.h" +#include <atomic> #include "DBCStores.h" #include "QuestDef.h" #include "SharedDefines.h" diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt index 334920d9c8b..31c61cdf0e6 100644 --- a/src/server/scripts/CMakeLists.txt +++ b/src/server/scripts/CMakeLists.txt @@ -145,6 +145,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/server/game/World ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders ${MYSQL_INCLUDE_DIR} + ${VALGRIND_INCLUDE_DIR} ) add_library(scripts STATIC diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt index a61248f01ea..7a02e415d69 100644 --- a/src/server/shared/CMakeLists.txt +++ b/src/server/shared/CMakeLists.txt @@ -77,6 +77,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object ${MYSQL_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR} + ${VALGRIND_INCLUDE_DIR} ) add_library(shared STATIC diff --git a/src/server/shared/Define.h b/src/server/shared/Define.h index 5d5da7e600e..2723d287c53 100644 --- a/src/server/shared/Define.h +++ b/src/server/shared/Define.h @@ -31,6 +31,11 @@ # if !defined(_GLIBCXX_USE_NANOSLEEP) # define _GLIBCXX_USE_NANOSLEEP # endif +# if defined(HELGRIND) +# include <valgrind/helgrind.h> +# define _GLIBCXX_SYNCHRONIZATION_HAPPENS_BEFORE(A) ANNOTATE_HAPPENS_BEFORE(A) +# define _GLIBCXX_SYNCHRONIZATION_HAPPENS_AFTER(A) ANNOTATE_HAPPENS_AFTER(A) +# endif #endif #include <cstddef> diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt index 6df8c52aa06..0cdf5f13f79 100644 --- a/src/server/worldserver/CMakeLists.txt +++ b/src/server/worldserver/CMakeLists.txt @@ -140,6 +140,7 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/TCSoap ${MYSQL_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR} + ${VALGRIND_INCLUDE_DIR} ) add_executable(worldserver |