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/tools | |
| 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/tools')
| -rw-r--r-- | src/tools/mmaps_generator/CMakeLists.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/tools/mmaps_generator/CMakeLists.txt b/src/tools/mmaps_generator/CMakeLists.txt index 591e0cc8e98..c0268680657 100644 --- a/src/tools/mmaps_generator/CMakeLists.txt +++ b/src/tools/mmaps_generator/CMakeLists.txt @@ -18,7 +18,9 @@ set(mmap_gen_Includes ${CMAKE_SOURCE_DIR}/dep/bzip2 ${CMAKE_SOURCE_DIR}/dep/g3dlite/include ${CMAKE_SOURCE_DIR}/dep/recastnavigation/Recast + ${CMAKE_SOURCE_DIR}/dep/recastnavigation/Recast/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/game/Conditions ${CMAKE_SOURCE_DIR}/src/server/collision |