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

Merge branch 'cpp-btree' into jgrpp

Browse Source 
# Conflicts:
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs140.vcxproj
#	projects/openttd_vs140.vcxproj.filters
#	source.list
This commit is contained in:
Jonathan G Rennison
2017-02-07 22:29:44 +00:00
parent 1be9660730 3d0ed3547b
commit 76de8f9b13
16 changed files with 4024 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
projects/openttd_vs100.vcxproj
View File

@@ -1323,6 +1323,13 @@
<ClCompile Include="..\src\saveload\tracerestrict_sl.cpp" />
<ClCompile Include="..\src\scope_info.cpp" />
<ClInclude Include="..\src\scope_info.h" />
<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\tbtr_template_gui_main.cpp">
@@ -3198,6 +3201,27 @@
<ClInclude Include="..\src\scope_info.h">
<Filter>Threading</Filter>
</ClInclude>
<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

@@ -1340,6 +1340,13 @@
<ClCompile Include="..\src\saveload\tracerestrict_sl.cpp" />
<ClCompile Include="..\src\scope_info.cpp" />
<ClInclude Include="..\src\scope_info.h" />
<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\tbtr_template_gui_main.cpp">
@@ -3198,6 +3201,27 @@
<ClInclude Include="..\src\scope_info.h">
<Filter>Threading</Filter>
</ClInclude>
<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

@@ -4691,6 +4691,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

@@ -4688,6 +4688,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"
>