synched with trunk at revision 34793

2 files changed, 35 insertions, 279 deletions

diff --git a/extern/recastnavigation/CMakeLists.txt b/extern/recastnavigation/CMakeLists.txt
index d36de44a766..d03022a2ccf 100644
--- a/extern/recastnavigation/CMakeLists.txt
+++ b/extern/recastnavigation/CMakeLists.txt
@@ -24,9 +24,40 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC Recast/Include Detour/Include)
+set(INC 
+		Recast/Include 
+		Detour/Include
+)
 
-FILE(GLOB SRC Recast/Source/*.cpp Detour/Source/*.cpp)
+set(SRC 
+		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
+			
+		Recast/Source/Recast.cpp
+		Recast/Source/RecastContour.cpp
+		Recast/Source/RecastFilter.cpp
+		Recast/Source/RecastLog.cpp
+		Recast/Source/RecastMesh.cpp
+		Recast/Source/RecastMeshDetail.cpp
+		Recast/Source/RecastRasterization.cpp
+		Recast/Source/RecastRegion.cpp
+		Recast/Source/RecastTimer.cpp
+		
+		Recast/Include/Recast.h
+		Recast/Include/RecastLog.h
+		Recast/Include/RecastTimer.h	
+)
+
+blender_add_lib(extern_recastnavigation "${SRC}" "${INC}")
 
-BLENDERLIB(extern_recastnavigation "${SRC}" "${INC}")
-#, libtype='blender', priority = 0 )
diff --git a/extern/recastnavigation/make/msvc_9_0/recastnavigation.vcproj b/extern/recastnavigation/make/msvc_9_0/recastnavigation.vcproj
deleted file mode 100644
index bc3004da895..00000000000
--- a/extern/recastnavigation/make/msvc_9_0/recastnavigation.vcproj
+++ /dev/null
@@ -1,275 +0,0 @@
-<?xml version="1.0" encoding="windows-1251"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9.00"

-	Name="EXT_recastnavigation"

-	ProjectGUID="{FB55B14E-D38E-4D04-BA7B-748EBC97FDB6}"

-	RootNamespace="EXT_recastnavigation"

-	Keyword="Win32Proj"

-	TargetFrameworkVersion="196613"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="..\..\..\..\..\build\msvc_9\extern\recastnavigation\debug"

-			IntermediateDirectory="..\..\..\..\..\build\msvc_9\extern\recastnavigation\debug"

-			ConfigurationType="4"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="../../Recast/Include;../../Detour/Include;../../../../source/blender/makesdna;../../../../source/blender/blenkernel;../../../../source/blender/blenlib"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="..\..\..\..\..\build\msvc_9\libs\extern\debug\RecastNavigation.lib"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-				CommandLine="ECHO Copying header files&#x0D;&#x0A;IF NOT EXIST ..\..\..\..\..\build\msvc_9\extern\recastnavigation\Detour MKDIR ..\..\..\..\..\build\msvc_9\extern\recastnavigation\Detour&#x0D;&#x0A;IF NOT EXIST ..\..\..\..\..\build\msvc_9\extern\recastnavigation\Detour\Include MKDIR ..\..\..\..\..\build\msvc_9\extern\recastnavigation\Detour\Include&#x0D;&#x0A;IF NOT EXIST ..\..\..\..\..\build\msvc_9\extern\recastnavigation\Recast\ MKDIR ..\..\..\..\..\build\msvc_9\extern\recastnavigation\Recast&#x0D;&#x0A;IF NOT EXIST ..\..\..\..\..\build\msvc_9\extern\recastnavigation\Recast\Include MKDIR ..\..\..\..\..\build\msvc_9\extern\recastnavigation\Recast\Include&#x0D;&#x0A;IF NOT EXIST ..\..\..\..\..\build\msvc_9\extern\recastnavigation\BlenderNavMesh MKDIR ..\..\..\..\..\build\msvc_9\extern\recastnavigation\BlenderNavMesh&#x0D;&#x0A;&#x0D;&#x0A;XCOPY /Y ..\..\Detour\Include\*.h ..\..\..\..\..\build\msvc_9\extern\recastnavigation\Detour\Include&#x0D;&#x0A;XCOPY /Y ..\..\Recast\Include\*.h ..\..\..\..\..\build\msvc_9\extern\recastnavigation\Recast\Include&#x0D;&#x0A;XCOPY /Y ..\..\BlenderNavMesh\*.h ..\..\..\..\..\build\msvc_9\extern\recastnavigation\BlenderNavMesh&#x0D;&#x0A;&#x0D;&#x0A;ECHO Done&#x0D;&#x0A;"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="..\..\..\..\..\build\msvc_9\extern\recastnavigation\release"

-			IntermediateDirectory="..\..\..\..\..\build\msvc_9\extern\recastnavigation\release"

-			ConfigurationType="4"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				EnableIntrinsicFunctions="false"

-				AdditionalIncludeDirectories="../../Recast/Include;../../Detour/Include;../../../../source/blender/makesdna;../../../../source/blender/blenkernel;../../../../source/blender/blenlib"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="..\..\..\..\..\build\msvc_9\libs\extern\release\RecastNavigation.lib"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-				CommandLine="ECHO Copying header files&#x0D;&#x0A;IF NOT EXIST ..\..\..\..\..\build\msvc_9\extern\recastnavigation\Detour MKDIR ..\..\..\..\..\build\msvc_9\extern\recastnavigation\Detour&#x0D;&#x0A;IF NOT EXIST ..\..\..\..\..\build\msvc_9\extern\recastnavigation\Detour\Include MKDIR ..\..\..\..\..\build\msvc_9\extern\recastnavigation\Detour\Include&#x0D;&#x0A;IF NOT EXIST ..\..\..\..\..\build\msvc_9\extern\recastnavigation\Recast\ MKDIR ..\..\..\..\..\build\msvc_9\extern\recastnavigation\Recast&#x0D;&#x0A;IF NOT EXIST ..\..\..\..\..\build\msvc_9\extern\recastnavigation\Recast\Include MKDIR ..\..\..\..\..\build\msvc_9\extern\recastnavigation\Recast\Include&#x0D;&#x0A;IF NOT EXIST ..\..\..\..\..\build\msvc_9\extern\recastnavigation\BlenderNavMesh MKDIR ..\..\..\..\..\build\msvc_9\extern\recastnavigation\BlenderNavMesh&#x0D;&#x0A;&#x0D;&#x0A;XCOPY /Y ..\..\Detour\Include\*.h ..\..\..\..\..\build\msvc_9\extern\recastnavigation\Detour\Include&#x0D;&#x0A;XCOPY /Y ..\..\Recast\Include\*.h ..\..\..\..\..\build\msvc_9\extern\recastnavigation\Recast\Include&#x0D;&#x0A;XCOPY /Y ..\..\BlenderNavMesh\*.h ..\..\..\..\..\build\msvc_9\extern\recastnavigation\BlenderNavMesh&#x0D;&#x0A;&#x0D;&#x0A;ECHO Done&#x0D;&#x0A;"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Recast"

-			>

-			<Filter

-				Name="Include"

-				>

-				<File

-					RelativePath="..\..\Recast\Include\Recast.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\Recast\Include\RecastLog.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\Recast\Include\RecastTimer.h"

-					>

-				</File>

-			</Filter>

-			<Filter

-				Name="Source"

-				>

-				<File

-					RelativePath="..\..\Recast\Source\Recast.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\Recast\Source\RecastContour.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\Recast\Source\RecastFilter.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\Recast\Source\RecastLog.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\Recast\Source\RecastMesh.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\Recast\Source\RecastMeshDetail.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\Recast\Source\RecastRasterization.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\Recast\Source\RecastRegion.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\Recast\Source\RecastTimer.cpp"

-					>

-				</File>

-			</Filter>

-		</Filter>

-		<Filter

-			Name="Detour"

-			>

-			<Filter

-				Name="Include"

-				>

-				<File

-					RelativePath="..\..\Detour\Include\DetourCommon.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\Detour\Include\DetourNode.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\Detour\Include\DetourStatNavMesh.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\Detour\Include\DetourStatNavMeshBuilder.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\Detour\Include\DetourTileNavMesh.h"

-					>

-				</File>

-				<File

-					RelativePath="..\..\Detour\Include\DetourTileNavMeshBuilder.h"

-					>

-				</File>

-			</Filter>

-			<Filter

-				Name="Source"

-				>

-				<File

-					RelativePath="..\..\Detour\Source\DetourCommon.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\Detour\Source\DetourNode.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\Detour\Source\DetourStatNavMesh.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\Detour\Source\DetourStatNavMeshBuilder.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\Detour\Source\DetourTileNavMesh.cpp"

-					>

-				</File>

-				<File

-					RelativePath="..\..\Detour\Source\DetourTileNavMeshBuilder.cpp"

-					>

-				</File>

-			</Filter>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>