diff options
| -rw-r--r-- | extern/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | extern/recastnavigation/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/creator/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/CMakeLists.txt | 2 |
4 files changed, 9 insertions, 3 deletions
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt index 7a59e41c89b..266ac6d9f0d 100644 --- a/extern/CMakeLists.txt +++ b/extern/CMakeLists.txt @@ -42,7 +42,11 @@ endif() if(WITH_BUILTIN_GLEW) add_subdirectory(glew) endif() -add_subdirectory(recastnavigation) + +## TODO MAKE GAME ENGINE ONLY +# if(WITH_GAMEENGINE) + add_subdirectory(recastnavigation) +# endif() if(WITH_IMAGE_OPENJPEG AND (NOT UNIX OR APPLE)) add_subdirectory(libopenjpeg) diff --git a/extern/recastnavigation/CMakeLists.txt b/extern/recastnavigation/CMakeLists.txt index 694f14293c2..1af01b1b427 100644 --- a/extern/recastnavigation/CMakeLists.txt +++ b/extern/recastnavigation/CMakeLists.txt @@ -63,4 +63,4 @@ set(SRC Recast/Include/RecastTimer.h ) -blender_add_lib(extern_recastnavigation "${SRC}" "${INC}" "${INC_SYS}")
\ No newline at end of file +blender_add_lib(extern_recastnavigation "${SRC}" "${INC}" "${INC_SYS}") diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 243f51f04db..93236f93ceb 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -819,6 +819,8 @@ endif() bf_blenfont bf_intern_audaspace bf_intern_mikktspace + extern_recastnavigation + bf_editor_util # --- BAD LEVEL CALL HERE --- XXX, this should be removed before release! ) if(WITH_MOD_CLOTH_ELTOPO) diff --git a/source/gameengine/Ketsji/CMakeLists.txt b/source/gameengine/Ketsji/CMakeLists.txt index 6846da5b019..4b2d828fe81 100644 --- a/source/gameengine/Ketsji/CMakeLists.txt +++ b/source/gameengine/Ketsji/CMakeLists.txt @@ -59,7 +59,7 @@ set(INC_SYS ${GLEW_INCLUDE_PATH} ../../../extern/recastnavigation/Recast/Include ../../../extern/recastnavigation/Detour/Include - ../../../source/blender/editors/include + ../../blender/editors/include ) set(SRC |