dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'cpp-btree' into infrastructure_sharing

Browse Source
This commit is contained in:
Jonathan G Rennison
2018-01-26 18:26:24 +00:00
parent 093bd804cd 344f39196f
commit ea3948aa2d
16 changed files with 4023 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
projects/openttd_vs100.vcxproj
View File

@@ -1291,6 +1291,13 @@
<ClCompile Include="..\src\os\windows\win32.cpp" />
<ClInclude Include="..\src\thread\thread.h" />
<ClCompile Include="..\src\thread\thread_win32.cpp" />
<ClInclude Include="..\src\3rdparty\cpp-btree\btree.h" />
<ClInclude Include="..\src\3rdparty\cpp-btree\btree_container.h" />
<ClInclude Include="..\src\3rdparty\cpp-btree\btree_map.h" />
<ClInclude Include="..\src\3rdparty\cpp-btree\btree_set.h" />
<ClInclude Include="..\src\3rdparty\cpp-btree\safe_btree.h" />
<ClInclude Include="..\src\3rdparty\cpp-btree\safe_btree_map.h" />
<ClInclude Include="..\src\3rdparty\cpp-btree\safe_btree_set.h" />
</ItemGroup>
<ItemGroup>
<None Include="..\media\openttd.ico" />

24
projects/openttd_vs100.vcxproj.filters
View File

@@ -100,6 +100,9 @@
<Filter Include="Threading">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000032}</UniqueIdentifier>
</Filter>
<Filter Include="Btree containers">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000033}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\airport.cpp">
@@ -3066,6 +3069,27 @@
<ClCompile Include="..\src\thread\thread_win32.cpp">
<Filter>Threading</Filter>
</ClCompile>
<ClInclude Include="..\src\3rdparty\cpp-btree\btree.h">
<Filter>Btree containers</Filter>
</ClInclude>
<ClInclude Include="..\src\3rdparty\cpp-btree\btree_container.h">
<Filter>Btree containers</Filter>
</ClInclude>
<ClInclude Include="..\src\3rdparty\cpp-btree\btree_map.h">
<Filter>Btree containers</Filter>
</ClInclude>
<ClInclude Include="..\src\3rdparty\cpp-btree\btree_set.h">
<Filter>Btree containers</Filter>
</ClInclude>
<ClInclude Include="..\src\3rdparty\cpp-btree\safe_btree.h">
<Filter>Btree containers</Filter>
</ClInclude>
<ClInclude Include="..\src\3rdparty\cpp-btree\safe_btree_map.h">
<Filter>Btree containers</Filter>
</ClInclude>
<ClInclude Include="..\src\3rdparty\cpp-btree\safe_btree_set.h">
<Filter>Btree containers</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\media\openttd.ico" />

7
projects/openttd_vs140.vcxproj
View File

@@ -1308,6 +1308,13 @@
<ClCompile Include="..\src\os\windows\win32.cpp" />
<ClInclude Include="..\src\thread\thread.h" />
<ClCompile Include="..\src\thread\thread_win32.cpp" />
<ClInclude Include="..\src\3rdparty\cpp-btree\btree.h" />
<ClInclude Include="..\src\3rdparty\cpp-btree\btree_container.h" />
<ClInclude Include="..\src\3rdparty\cpp-btree\btree_map.h" />
<ClInclude Include="..\src\3rdparty\cpp-btree\btree_set.h" />
<ClInclude Include="..\src\3rdparty\cpp-btree\safe_btree.h" />
<ClInclude Include="..\src\3rdparty\cpp-btree\safe_btree_map.h" />
<ClInclude Include="..\src\3rdparty\cpp-btree\safe_btree_set.h" />
</ItemGroup>
<ItemGroup>
<None Include="..\media\openttd.ico" />

24
projects/openttd_vs140.vcxproj.filters
View File

@@ -100,6 +100,9 @@
<Filter Include="Threading">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000032}</UniqueIdentifier>
</Filter>
<Filter Include="Btree containers">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000033}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\airport.cpp">
@@ -3066,6 +3069,27 @@
<ClCompile Include="..\src\thread\thread_win32.cpp">
<Filter>Threading</Filter>
</ClCompile>
<ClInclude Include="..\src\3rdparty\cpp-btree\btree.h">
<Filter>Btree containers</Filter>
</ClInclude>
<ClInclude Include="..\src\3rdparty\cpp-btree\btree_container.h">
<Filter>Btree containers</Filter>
</ClInclude>
<ClInclude Include="..\src\3rdparty\cpp-btree\btree_map.h">
<Filter>Btree containers</Filter>
</ClInclude>
<ClInclude Include="..\src\3rdparty\cpp-btree\btree_set.h">
<Filter>Btree containers</Filter>
</ClInclude>
<ClInclude Include="..\src\3rdparty\cpp-btree\safe_btree.h">
<Filter>Btree containers</Filter>
</ClInclude>
<ClInclude Include="..\src\3rdparty\cpp-btree\safe_btree_map.h">
<Filter>Btree containers</Filter>
</ClInclude>
<ClInclude Include="..\src\3rdparty\cpp-btree\safe_btree_set.h">
<Filter>Btree containers</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\media\openttd.ico" />

32
projects/openttd_vs80.vcproj
View File

@@ -4515,6 +4515,38 @@
>
</File>
</Filter>
<Filter
Name="Btree containers"
>
<File
RelativePath=".\..\src\3rdparty\cpp-btree\btree.h"
>
</File>
<File
RelativePath=".\..\src\3rdparty\cpp-btree\btree_container.h"
>
</File>
<File
RelativePath=".\..\src\3rdparty\cpp-btree\btree_map.h"
>
</File>
<File
RelativePath=".\..\src\3rdparty\cpp-btree\btree_set.h"
>
</File>
<File
RelativePath=".\..\src\3rdparty\cpp-btree\safe_btree.h"
>
</File>
<File
RelativePath=".\..\src\3rdparty\cpp-btree\safe_btree_map.h"
>
</File>
<File
RelativePath=".\..\src\3rdparty\cpp-btree\safe_btree_set.h"
>
</File>
</Filter>
<File
RelativePath=".\..\media\openttd.ico"
>

32
projects/openttd_vs90.vcproj
View File

@@ -4512,6 +4512,38 @@
>
</File>
</Filter>
<Filter
Name="Btree containers"
>
<File
RelativePath=".\..\src\3rdparty\cpp-btree\btree.h"
>
</File>
<File
RelativePath=".\..\src\3rdparty\cpp-btree\btree_container.h"
>
</File>
<File
RelativePath=".\..\src\3rdparty\cpp-btree\btree_map.h"
>
</File>
<File
RelativePath=".\..\src\3rdparty\cpp-btree\btree_set.h"
>
</File>
<File
RelativePath=".\..\src\3rdparty\cpp-btree\safe_btree.h"
>
</File>
<File
RelativePath=".\..\src\3rdparty\cpp-btree\safe_btree_map.h"
>
</File>
<File
RelativePath=".\..\src\3rdparty\cpp-btree\safe_btree_set.h"
>
</File>
</Filter>
<File
RelativePath=".\..\media\openttd.ico"
>