diff options
author | Mitchell Stokes <mogurijin@gmail.com> | 2013-07-17 05:40:26 +0400 |
---|---|---|
committer | Mitchell Stokes <mogurijin@gmail.com> | 2013-07-17 05:40:26 +0400 |
commit | eb21bdd249427465a093a078cda7864309a8f735 (patch) | |
tree | 1da7dc7f6fd3670bf28b2bf00dfe7ec356344105 /source/gameengine/Ketsji | |
parent | 5ba2f4367d6cebc415c4e20572a8cea4e52fb0c3 (diff) | |
parent | 20d6cd008b8a7b110fff3ca211651693916d9946 (diff) |
Merging changes from trunk r58091-58323.
Diffstat (limited to 'source/gameengine/Ketsji')
-rw-r--r-- | source/gameengine/Ketsji/CMakeLists.txt | 6 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KXNetwork/CMakeLists.txt | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/source/gameengine/Ketsji/CMakeLists.txt b/source/gameengine/Ketsji/CMakeLists.txt index 068b367022c..7da63dcc6f4 100644 --- a/source/gameengine/Ketsji/CMakeLists.txt +++ b/source/gameengine/Ketsji/CMakeLists.txt @@ -50,16 +50,16 @@ set(INC ../../blender/python/mathutils ../../../intern/container ../../../intern/guardedalloc - ../../../intern/moto/include ../../../intern/string ) set(INC_SYS + ../../../intern/moto/include + ../../../extern/recastnavigation/Recast/Include + ../../../extern/recastnavigation/Detour/Include ${PTHREADS_INCLUDE_DIRS} ${GLEW_INCLUDE_PATH} ${BOOST_INCLUDE_DIR} - ../../../extern/recastnavigation/Recast/Include - ../../../extern/recastnavigation/Detour/Include ) set(SRC diff --git a/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt b/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt index d5e2b375c72..0c661cf2c87 100644 --- a/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt +++ b/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt @@ -31,12 +31,11 @@ set(INC ../../Network ../../SceneGraph ../../../../intern/container - ../../../../intern/moto/include ../../../../intern/string ) set(INC_SYS - + ../../../../intern/moto/include ) set(SRC |