changed inclusion of recastNavigation library

CMakeLists.txt

@@ -27,11 +27,6 @@ include(FindPkgConfig)
 PKG_SEARCH_MODULE(SDL2 REQUIRED sdl2)
 PKG_SEARCH_MODULE(SDL2MIXER REQUIRED SDL2_mixer)
 include_directories(
-        ${CMAKE_CURRENT_SOURCE_DIR}/lib/recastnavigation/Recast/Include
-        ${CMAKE_CURRENT_SOURCE_DIR}/lib/recastnavigation/DetourCrowd/Include
-        ${CMAKE_CURRENT_SOURCE_DIR}/lib/recastnavigation/Detour/Include
-        ${CMAKE_CURRENT_SOURCE_DIR}/lib/recastnavigation/DebugUtils/Include
-        ${CMAKE_CURRENT_SOURCE_DIR}/lib/recastnavigation/DetourTileCache/Include
         ${CMAKE_CURRENT_SOURCE_DIR}/include
 )
 FILE(GLOB_RECURSE clion_all_headers
@@ -74,23 +69,58 @@ set(glew_SRC
 add_definitions(-DGLEW_STATIC)
 add_library(glew_static ${glew_SRC})
 
-FILE(GLOB_RECURSE Recast_cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/lib/recastnavigation/Recast/*.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/lib/recastnavigation/Recast/*.h
-)
 
-add_library(Recast STATIC ${Recast_cpp})
+#recastNavigation library
+include_directories(
+	${CMAKE_CURRENT_SOURCE_DIR}/lib/recastnavigation/Recast/Include
+	${CMAKE_CURRENT_SOURCE_DIR}/lib/recastnavigation/Detour/Include
+	${CMAKE_CURRENT_SOURCE_DIR}/lib/recastnavigation/DetourCrowd/Include
+	${CMAKE_CURRENT_SOURCE_DIR}/lib/recastnavigation/DetourTileCache/Include
+	${CMAKE_CURRENT_SOURCE_DIR}/lib/recastnavigation/DebugUtils/Include
+)
+set(recast_SRC
+	${CMAKE_CURRENT_SOURCE_DIR}/lib/recastnavigation/Recast/Source/Recast.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/lib/recastnavigation/Recast/Source/RecastArea.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/lib/recastnavigation/Recast/Source/RecastAlloc.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/lib/recastnavigation/Recast/Source/RecastContour.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/lib/recastnavigation/Recast/Source/RecastFilter.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/lib/recastnavigation/Recast/Source/RecastLayers.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/lib/recastnavigation/Recast/Source/RecastMesh.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/lib/recastnavigation/Recast/Source/RecastMeshDetail.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/lib/recastnavigation/Recast/Source/RecastRasterization.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/lib/recastnavigation/Recast/Source/RecastRegion.cpp
+)
+add_library(Recast ${recast_SRC})
+
+set(detour_SRC
+	${CMAKE_CURRENT_SOURCE_DIR}/lib/recastnavigation/Detour/Source/DetourAlloc.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/lib/recastnavigation/Detour/Source/DetourCommon.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/lib/recastnavigation/Detour/Source/DetourNavMesh.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/lib/recastnavigation/Detour/Source/DetourNavMeshBuilder.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/lib/recastnavigation/Detour/Source/DetourNavMeshQuery.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/lib/recastnavigation/Detour/Source/DetourNode.cpp
+)
+add_library(Detour ${detour_SRC})
+
+set(detourcrowd_SRC
+	${CMAKE_CURRENT_SOURCE_DIR}/lib/recastnavigation/DetourCrowd/Source/DetourPathCorridor.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/lib/recastnavigation/DetourCrowd/Source/DetourLocalBoundary.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/lib/recastnavigation/DetourCrowd/Source/DetourObstacleAvoidance.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/lib/recastnavigation/DetourCrowd/Source/DetourPathQueue.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/lib/recastnavigation/DetourCrowd/Source/DetourCrowd.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/lib/recastnavigation/DetourCrowd/Source/DetourProximityGrid.cpp
+)
+add_library(DetourCrowd ${detourcrowd_SRC})
 
-FILE(GLOB_RECURSE Detour_cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/lib/recastnavigation/Detour/*.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/lib/recastnavigation/Detour/*.h
+set(debugutils_SRC
+	${CMAKE_CURRENT_SOURCE_DIR}/lib/recastnavigation/DebugUtils/Source/DebugDraw.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/lib/recastnavigation/DebugUtils/Source/DetourDebugDraw.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/lib/recastnavigation/DebugUtils/Source/RecastDebugDraw.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/lib/recastnavigation/DebugUtils/Source/RecastDump.cpp
 )
+add_library(DebugUtils ${debugutils_SRC})
 
-add_library(Detour STATIC ${Detour_cpp})
 
-FILE(GLOB_RECURSE DetourCrowd_cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/lib/recastnavigation/DetourCrowd/*.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/lib/recastnavigation/DetourCrowd/*.h
 #nanovg library
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/lib/nanovg/src)
 set(nanovg_SRC
@@ -98,21 +128,14 @@ set(nanovg_SRC
 )
 add_library(nanovg ${nanovg_SRC})
 
-add_library(DetourCrowd STATIC ${DetourCrowd_cpp})
 
-FILE(GLOB_RECURSE DebugUtils
-        ${CMAKE_CURRENT_SOURCE_DIR}/lib/recastnavigation/DebugUtils/*.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/lib/recastnavigation/DebugUtils/*.h
-)
 ################################################################################
 # Project settings
 ################################################################################
 
-add_library(DebugUtils STATIC ${DebugUtils})
 
 )
 
-add_library(nanovg STATIC ${nanovg_src})
 
 set(LINKED_LIBRARIES
         glew_static