Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fixed linking with CMake

Browse Source
This commit is contained in:
Campbell Barton
2011-09-10 03:42:45 +00:00
parent 0128218254
commit fb4abf2e41
4 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
extern/CMakeLists.txt vendored
View File

@@ -42,7 +42,11 @@ endif()
if(WITH_BUILTIN_GLEW) if(WITH_BUILTIN_GLEW)
add_subdirectory(glew) add_subdirectory(glew)
endif() 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)) if(WITH_IMAGE_OPENJPEG AND (NOT UNIX OR APPLE))
add_subdirectory(libopenjpeg) add_subdirectory(libopenjpeg)

2
extern/recastnavigation/CMakeLists.txt vendored
View File

@@ -63,4 +63,4 @@ set(SRC
Recast/Include/RecastTimer.h Recast/Include/RecastTimer.h
) )
blender_add_lib(extern_recastnavigation "${SRC}" "${INC}" "${INC_SYS}") blender_add_lib(extern_recastnavigation "${SRC}" "${INC}" "${INC_SYS}")

2
source/creator/CMakeLists.txt
View File

@@ -819,6 +819,8 @@ endif()
bf_blenfont bf_blenfont
bf_intern_audaspace bf_intern_audaspace
bf_intern_mikktspace bf_intern_mikktspace
extern_recastnavigation
bf_editor_util # --- BAD LEVEL CALL HERE --- XXX, this should be removed before release!
) )
if(WITH_MOD_CLOTH_ELTOPO) if(WITH_MOD_CLOTH_ELTOPO)

2
source/gameengine/Ketsji/CMakeLists.txt
View File

@@ -59,7 +59,7 @@ set(INC_SYS
${GLEW_INCLUDE_PATH} ${GLEW_INCLUDE_PATH}
../../../extern/recastnavigation/Recast/Include ../../../extern/recastnavigation/Recast/Include
../../../extern/recastnavigation/Detour/Include ../../../extern/recastnavigation/Detour/Include
../../../source/blender/editors/include ../../blender/editors/include
) )
set(SRC set(SRC