Skip to content

Commit 13d2005

Browse files
committed
Merge pull request #4 from songchengjiang/v3
filter unused files
2 parents 634dc57 + 64d3f59 commit 13d2005

File tree

4 files changed

+6
-103
lines changed

4 files changed

+6
-103
lines changed

recast/Android.mk

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ LOCAL_MODULE_FILENAME := librecast
99
LOCAL_SRC_FILES := \
1010
DebugUtils/DebugDraw.cpp \
1111
DebugUtils/DetourDebugDraw.cpp \
12-
DebugUtils/RecastDebugDraw.cpp \
13-
DebugUtils/RecastDump.cpp \
1412
Detour/DetourAlloc.cpp \
1513
Detour/DetourCommon.cpp \
1614
Detour/DetourNavMesh.cpp \
@@ -22,19 +20,8 @@ DetourCrowd/DetourLocalBoundary.cpp \
2220
DetourCrowd/DetourObstacleAvoidance.cpp \
2321
DetourCrowd/DetourPathCorridor.cpp \
2422
DetourCrowd/DetourPathQueue.cpp \
25-
DetourCrowd/DetourProximityGrid.cpp \
2623
DetourTileCache/DetourTileCache.cpp \
27-
DetourTileCache/DetourTileCacheBuilder.cpp \
28-
Recast/Recast.cpp \
29-
Recast/RecastAlloc.cpp \
30-
Recast/RecastArea.cpp \
31-
Recast/RecastContour.cpp \
32-
Recast/RecastFilter.cpp \
33-
Recast/RecastLayers.cpp \
34-
Recast/RecastMesh.cpp \
35-
Recast/RecastMeshDetail.cpp \
36-
Recast/RecastRasterization.cpp \
37-
Recast/RecastRegion.cpp
24+
DetourTileCache/DetourTileCacheBuilder.cpp
3825

3926
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/..
4027

recast/CMakeLists.txt

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
set(RECAST_SRC
22
DebugUtils/DebugDraw.cpp
33
DebugUtils/DetourDebugDraw.cpp
4-
DebugUtils/RecastDebugDraw.cpp
5-
DebugUtils/RecastDump.cpp
64
Detour/DetourAlloc.cpp
75
Detour/DetourCommon.cpp
86
Detour/DetourNavMesh.cpp
@@ -14,19 +12,8 @@ DetourCrowd/DetourLocalBoundary.cpp
1412
DetourCrowd/DetourObstacleAvoidance.cpp
1513
DetourCrowd/DetourPathCorridor.cpp
1614
DetourCrowd/DetourPathQueue.cpp
17-
DetourCrowd/DetourProximityGrid.cpp
1815
DetourTileCache/DetourTileCache.cpp
1916
DetourTileCache/DetourTileCacheBuilder.cpp
20-
Recast/Recast.cpp
21-
Recast/RecastAlloc.cpp
22-
Recast/RecastArea.cpp
23-
Recast/RecastContour.cpp
24-
Recast/RecastFilter.cpp
25-
Recast/RecastLayers.cpp
26-
Recast/RecastMesh.cpp
27-
Recast/RecastMeshDetail.cpp
28-
Recast/RecastRasterization.cpp
29-
Recast/RecastRegion.cpp
3017
)
3118

3219
include_directories(

recast/proj.win32/librecast.vcxproj

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
@@ -13,8 +13,6 @@
1313
<ItemGroup>
1414
<ClCompile Include="..\DebugUtils\DebugDraw.cpp" />
1515
<ClCompile Include="..\DebugUtils\DetourDebugDraw.cpp" />
16-
<ClCompile Include="..\DebugUtils\RecastDebugDraw.cpp" />
17-
<ClCompile Include="..\DebugUtils\RecastDump.cpp" />
1816
<ClCompile Include="..\DetourCrowd\DetourCrowd.cpp" />
1917
<ClCompile Include="..\DetourCrowd\DetourLocalBoundary.cpp" />
2018
<ClCompile Include="..\DetourCrowd\DetourObstacleAvoidance.cpp" />
@@ -29,22 +27,10 @@
2927
<ClCompile Include="..\Detour\DetourNavMeshBuilder.cpp" />
3028
<ClCompile Include="..\Detour\DetourNavMeshQuery.cpp" />
3129
<ClCompile Include="..\Detour\DetourNode.cpp" />
32-
<ClCompile Include="..\Recast\Recast.cpp" />
33-
<ClCompile Include="..\Recast\RecastAlloc.cpp" />
34-
<ClCompile Include="..\Recast\RecastArea.cpp" />
35-
<ClCompile Include="..\Recast\RecastContour.cpp" />
36-
<ClCompile Include="..\Recast\RecastFilter.cpp" />
37-
<ClCompile Include="..\Recast\RecastLayers.cpp" />
38-
<ClCompile Include="..\Recast\RecastMesh.cpp" />
39-
<ClCompile Include="..\Recast\RecastMeshDetail.cpp" />
40-
<ClCompile Include="..\Recast\RecastRasterization.cpp" />
41-
<ClCompile Include="..\Recast\RecastRegion.cpp" />
4230
</ItemGroup>
4331
<ItemGroup>
4432
<ClInclude Include="..\DebugUtils\DebugDraw.h" />
4533
<ClInclude Include="..\DebugUtils\DetourDebugDraw.h" />
46-
<ClInclude Include="..\DebugUtils\RecastDebugDraw.h" />
47-
<ClInclude Include="..\DebugUtils\RecastDump.h" />
4834
<ClInclude Include="..\DetourCrowd\DetourCrowd.h" />
4935
<ClInclude Include="..\DetourCrowd\DetourLocalBoundary.h" />
5036
<ClInclude Include="..\DetourCrowd\DetourObstacleAvoidance.h" />
@@ -62,9 +48,6 @@
6248
<ClInclude Include="..\Detour\DetourNavMeshQuery.h" />
6349
<ClInclude Include="..\Detour\DetourNode.h" />
6450
<ClInclude Include="..\Detour\DetourStatus.h" />
65-
<ClInclude Include="..\Recast\Recast.h" />
66-
<ClInclude Include="..\Recast\RecastAlloc.h" />
67-
<ClInclude Include="..\Recast\RecastAssert.h" />
6851
</ItemGroup>
6952
<PropertyGroup Label="Globals">
7053
<ProjectGuid>{41E34993-647E-4282-8384-4AB1AE31A452}</ProjectGuid>
@@ -75,13 +58,13 @@
7558
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
7659
<ConfigurationType>StaticLibrary</ConfigurationType>
7760
<UseDebugLibraries>true</UseDebugLibraries>
78-
<PlatformToolset>v110</PlatformToolset>
61+
<PlatformToolset>v120</PlatformToolset>
7962
<CharacterSet>Unicode</CharacterSet>
8063
</PropertyGroup>
8164
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
8265
<ConfigurationType>StaticLibrary</ConfigurationType>
8366
<UseDebugLibraries>false</UseDebugLibraries>
84-
<PlatformToolset>v110</PlatformToolset>
67+
<PlatformToolset>v120</PlatformToolset>
8568
<WholeProgramOptimization>false</WholeProgramOptimization>
8669
<CharacterSet>Unicode</CharacterSet>
8770
</PropertyGroup>

recast/proj.win32/librecast.vcxproj.filters

Lines changed: 2 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,10 @@
88
<UniqueIdentifier>{0bb8e4f7-4a37-48b6-8fc8-b2ae500329a1}</UniqueIdentifier>
99
</Filter>
1010
<Filter Include="DetourCrowd">
11-
<UniqueIdentifier>{56ac435d-63ed-4cf1-8021-17828ad09aba}</UniqueIdentifier>
11+
<UniqueIdentifier>{b8f0ec71-f58c-4544-9525-4e9f9c15aa42}</UniqueIdentifier>
1212
</Filter>
1313
<Filter Include="DetourTileCache">
14-
<UniqueIdentifier>{3801d61c-5696-4c52-a072-d2b20962f579}</UniqueIdentifier>
15-
</Filter>
16-
<Filter Include="Recast">
17-
<UniqueIdentifier>{dd6424d7-f194-4eaa-83a1-d46352a31204}</UniqueIdentifier>
14+
<UniqueIdentifier>{967cc456-81ac-4764-ae7c-4aab608b9fa9}</UniqueIdentifier>
1815
</Filter>
1916
</ItemGroup>
2017
<ItemGroup>
@@ -24,12 +21,6 @@
2421
<ClCompile Include="..\DebugUtils\DetourDebugDraw.cpp">
2522
<Filter>DebugUtils</Filter>
2623
</ClCompile>
27-
<ClCompile Include="..\DebugUtils\RecastDebugDraw.cpp">
28-
<Filter>DebugUtils</Filter>
29-
</ClCompile>
30-
<ClCompile Include="..\DebugUtils\RecastDump.cpp">
31-
<Filter>DebugUtils</Filter>
32-
</ClCompile>
3324
<ClCompile Include="..\Detour\DetourAlloc.cpp">
3425
<Filter>Detour</Filter>
3526
</ClCompile>
@@ -72,36 +63,6 @@
7263
<ClCompile Include="..\DetourTileCache\DetourTileCacheBuilder.cpp">
7364
<Filter>DetourTileCache</Filter>
7465
</ClCompile>
75-
<ClCompile Include="..\Recast\Recast.cpp">
76-
<Filter>Recast</Filter>
77-
</ClCompile>
78-
<ClCompile Include="..\Recast\RecastAlloc.cpp">
79-
<Filter>Recast</Filter>
80-
</ClCompile>
81-
<ClCompile Include="..\Recast\RecastArea.cpp">
82-
<Filter>Recast</Filter>
83-
</ClCompile>
84-
<ClCompile Include="..\Recast\RecastContour.cpp">
85-
<Filter>Recast</Filter>
86-
</ClCompile>
87-
<ClCompile Include="..\Recast\RecastFilter.cpp">
88-
<Filter>Recast</Filter>
89-
</ClCompile>
90-
<ClCompile Include="..\Recast\RecastLayers.cpp">
91-
<Filter>Recast</Filter>
92-
</ClCompile>
93-
<ClCompile Include="..\Recast\RecastMesh.cpp">
94-
<Filter>Recast</Filter>
95-
</ClCompile>
96-
<ClCompile Include="..\Recast\RecastMeshDetail.cpp">
97-
<Filter>Recast</Filter>
98-
</ClCompile>
99-
<ClCompile Include="..\Recast\RecastRasterization.cpp">
100-
<Filter>Recast</Filter>
101-
</ClCompile>
102-
<ClCompile Include="..\Recast\RecastRegion.cpp">
103-
<Filter>Recast</Filter>
104-
</ClCompile>
10566
</ItemGroup>
10667
<ItemGroup>
10768
<ClInclude Include="..\DebugUtils\DebugDraw.h">
@@ -110,12 +71,6 @@
11071
<ClInclude Include="..\DebugUtils\DetourDebugDraw.h">
11172
<Filter>DebugUtils</Filter>
11273
</ClInclude>
113-
<ClInclude Include="..\DebugUtils\RecastDebugDraw.h">
114-
<Filter>DebugUtils</Filter>
115-
</ClInclude>
116-
<ClInclude Include="..\DebugUtils\RecastDump.h">
117-
<Filter>DebugUtils</Filter>
118-
</ClInclude>
11974
<ClInclude Include="..\Detour\DetourAlloc.h">
12075
<Filter>Detour</Filter>
12176
</ClInclude>
@@ -167,14 +122,5 @@
167122
<ClInclude Include="..\DetourTileCache\DetourTileCacheBuilder.h">
168123
<Filter>DetourTileCache</Filter>
169124
</ClInclude>
170-
<ClInclude Include="..\Recast\Recast.h">
171-
<Filter>Recast</Filter>
172-
</ClInclude>
173-
<ClInclude Include="..\Recast\RecastAlloc.h">
174-
<Filter>Recast</Filter>
175-
</ClInclude>
176-
<ClInclude Include="..\Recast\RecastAssert.h">
177-
<Filter>Recast</Filter>
178-
</ClInclude>
179125
</ItemGroup>
180126
</Project>

0 commit comments

Comments
 (0)