diff options
| -rw-r--r-- | CMakeLists.txt | 15 | ||||
| -rw-r--r-- | extern/recastnavigation/CMakeLists.txt | 58 |
2 files changed, 29 insertions, 44 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5401262b940..408cf22035c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -823,21 +823,6 @@ set(PLATFORM_LINKFLAGS "") set(PLATFORM_LINKFLAGS_DEBUG "") -# For alternate Python locations the commandline can be used to override detected/default cache settings, e.g: -# On Unix: -# cmake ../blender \ -# -D PYTHON_VERSION=3.5 \ -# -D PYTHON_INCLUDE_DIR=/opt/py35/include/python3.5d \ -# -D PYTHON_LIBRARY=/opt/py35/lib/libpython3.5d.so -# -# On Macs: -# cmake ../blender \ -# -D PYTHON_INCLUDE_DIR=/System/Library/Frameworks/Python.framework/Versions/3.5/include/python3.5 \ -# -D PYTHON_LIBPATH=/System/Library/Frameworks/Python.framework/Versions/3.5/lib/python3.5/config \ -# -G Xcode -# -# When changing any of this remember to update the notes in doc/build_systems/cmake.txt - #----------------------------------------------------------------------------- #Platform specifics diff --git a/extern/recastnavigation/CMakeLists.txt b/extern/recastnavigation/CMakeLists.txt index d6c7fd357b1..b90a36c0d8f 100644 --- a/extern/recastnavigation/CMakeLists.txt +++ b/extern/recastnavigation/CMakeLists.txt @@ -24,8 +24,8 @@ # ***** END GPL LICENSE BLOCK ***** set(INC - Recast/Include - Detour/Include + Recast/Include + Detour/Include ) set(INC_SYS @@ -33,38 +33,38 @@ set(INC_SYS ) set(SRC - recast-capi.cpp - recast-capi.h + recast-capi.cpp + recast-capi.h - Detour/Source/DetourCommon.cpp - Detour/Source/DetourNode.cpp - Detour/Source/DetourStatNavMesh.cpp - Detour/Source/DetourStatNavMeshBuilder.cpp - Detour/Source/DetourTileNavMesh.cpp - Detour/Source/DetourTileNavMeshBuilder.cpp + Detour/Source/DetourCommon.cpp + Detour/Source/DetourNode.cpp + Detour/Source/DetourStatNavMesh.cpp + Detour/Source/DetourStatNavMeshBuilder.cpp + Detour/Source/DetourTileNavMesh.cpp + Detour/Source/DetourTileNavMeshBuilder.cpp - Detour/Include/DetourCommon.h - Detour/Include/DetourNode.h - Detour/Include/DetourStatNavMesh.h - Detour/Include/DetourStatNavMeshBuilder.h - Detour/Include/DetourTileNavMesh.h - Detour/Include/DetourTileNavMeshBuilder.h + Detour/Include/DetourCommon.h + Detour/Include/DetourNode.h + Detour/Include/DetourStatNavMesh.h + Detour/Include/DetourStatNavMeshBuilder.h + Detour/Include/DetourTileNavMesh.h + Detour/Include/DetourTileNavMeshBuilder.h - Recast/Source/Recast.cpp - Recast/Source/RecastAlloc.cpp - Recast/Source/RecastArea.cpp - Recast/Source/RecastContour.cpp - Recast/Source/RecastFilter.cpp - Recast/Source/RecastLayers.cpp - Recast/Source/RecastMesh.cpp - Recast/Source/RecastMeshDetail.cpp - Recast/Source/RecastRasterization.cpp - Recast/Source/RecastRegion.cpp + Recast/Source/Recast.cpp + Recast/Source/RecastAlloc.cpp + Recast/Source/RecastArea.cpp + Recast/Source/RecastContour.cpp + Recast/Source/RecastFilter.cpp + Recast/Source/RecastLayers.cpp + Recast/Source/RecastMesh.cpp + Recast/Source/RecastMeshDetail.cpp + Recast/Source/RecastRasterization.cpp + Recast/Source/RecastRegion.cpp - Recast/Include/Recast.h - Recast/Include/RecastAlloc.h - Recast/Include/RecastAssert.h + Recast/Include/Recast.h + Recast/Include/RecastAlloc.h + Recast/Include/RecastAssert.h ) blender_add_lib(extern_recastnavigation "${SRC}" "${INC}" "${INC_SYS}") |