diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-06-21 00:07:48 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-06-21 00:07:48 +0200 |
| commit | 1d210bc490a6cc99c20f1be79eab6fe133e82870 (patch) | |
| tree | 2cac8e78a8a29548bd346255703371a07c76d3da /src/server/collision | |
| parent | 42f3c9cf5b32cdd6e00675c34584b679d27d353e (diff) | |
| parent | 0892c71a16a1fc01822946bdb006eff5bdec9315 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
dep/PackageList.txt
Diffstat (limited to 'src/server/collision')
| -rw-r--r-- | src/server/collision/CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/server/collision/CMakeLists.txt b/src/server/collision/CMakeLists.txt index a83bb9dad1c..a2024bff7cb 100644 --- a/src/server/collision/CMakeLists.txt +++ b/src/server/collision/CMakeLists.txt @@ -34,6 +34,7 @@ include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/dep/g3dlite/include ${CMAKE_SOURCE_DIR}/dep/recastnavigation/Detour + ${CMAKE_SOURCE_DIR}/dep/recastnavigation/Detour/Include ${CMAKE_SOURCE_DIR}/src/server/shared ${CMAKE_SOURCE_DIR}/src/server/shared/Configuration ${CMAKE_SOURCE_DIR}/src/server/shared/Debugging |