miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
dP
2020-07-09 11:35:03 +03:00
parent 464f128534 65fec1b645
commit 0a6813ebd9
6 changed files with 60 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
projects/openttd_vs140.vcxproj
View File

@@ -1373,6 +1373,8 @@
<ClCompile Include="..\src\os\windows\string_uniscribe.cpp" />
<ClCompile Include="..\src\os\windows\win32.cpp" />
<ClInclude Include="..\src\thread.h" />
<ClInclude Include="..\src\citymania\cm_bitstream.hpp" />
<ClCompile Include="..\src\citymania\cm_bitstream.cpp" />
<ClInclude Include="..\src\citymania\cm_console_cmds.hpp" />
<ClCompile Include="..\src\citymania\cm_console_cmds.cpp" />
<ClInclude Include="..\src\citymania\cm_event.hpp" />
@@ -1383,6 +1385,9 @@
<ClInclude Include="..\src\citymania\cm_main.hpp" />
<ClCompile Include="..\src\citymania\cm_main.cpp" />
<ClInclude Include="..\src\citymania\cm_type.hpp" />
<ClInclude Include="..\src\citymania\cm_saveload.hpp" />
<ClCompile Include="..\src\citymania\cm_saveload.cpp" />
<ClInclude Include="..\src\citymania\cm_settings.hpp" />
<ClInclude Include="..\src\citymania\extensions\cmext_town.hpp" />
<ClInclude Include="..\src\citymania\extensions\cmext_company.hpp" />
</ItemGroup>

15
projects/openttd_vs140.vcxproj.filters
View File

@@ -3213,6 +3213,12 @@
<ClInclude Include="..\src\thread.h">
<Filter>Threading</Filter>
</ClInclude>
<ClInclude Include="..\src\citymania\cm_bitstream.hpp">
<Filter>CityMania</Filter>
</ClInclude>
<ClCompile Include="..\src\citymania\cm_bitstream.cpp">
<Filter>CityMania</Filter>
</ClCompile>
<ClInclude Include="..\src\citymania\cm_console_cmds.hpp">
<Filter>CityMania</Filter>
</ClInclude>
@@ -3243,6 +3249,15 @@
<ClInclude Include="..\src\citymania\cm_type.hpp">
<Filter>CityMania</Filter>
</ClInclude>
<ClInclude Include="..\src\citymania\cm_saveload.hpp">
<Filter>CityMania</Filter>
</ClInclude>
<ClCompile Include="..\src\citymania\cm_saveload.cpp">
<Filter>CityMania</Filter>
</ClCompile>
<ClInclude Include="..\src\citymania\cm_settings.hpp">
<Filter>CityMania</Filter>
</ClInclude>
<ClInclude Include="..\src\citymania\extensions\cmext_town.hpp">
<Filter>CityMania</Filter>
</ClInclude>

5
projects/openttd_vs141.vcxproj
View File

@@ -1373,6 +1373,8 @@
<ClCompile Include="..\src\os\windows\string_uniscribe.cpp" />
<ClCompile Include="..\src\os\windows\win32.cpp" />
<ClInclude Include="..\src\thread.h" />
<ClInclude Include="..\src\citymania\cm_bitstream.hpp" />
<ClCompile Include="..\src\citymania\cm_bitstream.cpp" />
<ClInclude Include="..\src\citymania\cm_console_cmds.hpp" />
<ClCompile Include="..\src\citymania\cm_console_cmds.cpp" />
<ClInclude Include="..\src\citymania\cm_event.hpp" />
@@ -1383,6 +1385,9 @@
<ClInclude Include="..\src\citymania\cm_main.hpp" />
<ClCompile Include="..\src\citymania\cm_main.cpp" />
<ClInclude Include="..\src\citymania\cm_type.hpp" />
<ClInclude Include="..\src\citymania\cm_saveload.hpp" />
<ClCompile Include="..\src\citymania\cm_saveload.cpp" />
<ClInclude Include="..\src\citymania\cm_settings.hpp" />
<ClInclude Include="..\src\citymania\extensions\cmext_town.hpp" />
<ClInclude Include="..\src\citymania\extensions\cmext_company.hpp" />
</ItemGroup>

15
projects/openttd_vs141.vcxproj.filters
View File

@@ -3213,6 +3213,12 @@
<ClInclude Include="..\src\thread.h">
<Filter>Threading</Filter>
</ClInclude>
<ClInclude Include="..\src\citymania\cm_bitstream.hpp">
<Filter>CityMania</Filter>
</ClInclude>
<ClCompile Include="..\src\citymania\cm_bitstream.cpp">
<Filter>CityMania</Filter>
</ClCompile>
<ClInclude Include="..\src\citymania\cm_console_cmds.hpp">
<Filter>CityMania</Filter>
</ClInclude>
@@ -3243,6 +3249,15 @@
<ClInclude Include="..\src\citymania\cm_type.hpp">
<Filter>CityMania</Filter>
</ClInclude>
<ClInclude Include="..\src\citymania\cm_saveload.hpp">
<Filter>CityMania</Filter>
</ClInclude>
<ClCompile Include="..\src\citymania\cm_saveload.cpp">
<Filter>CityMania</Filter>
</ClCompile>
<ClInclude Include="..\src\citymania\cm_settings.hpp">
<Filter>CityMania</Filter>
</ClInclude>
<ClInclude Include="..\src\citymania\extensions\cmext_town.hpp">
<Filter>CityMania</Filter>
</ClInclude>

5
projects/openttd_vs142.vcxproj
View File

@@ -1373,6 +1373,8 @@
<ClCompile Include="..\src\os\windows\string_uniscribe.cpp" />
<ClCompile Include="..\src\os\windows\win32.cpp" />
<ClInclude Include="..\src\thread.h" />
<ClInclude Include="..\src\citymania\cm_bitstream.hpp" />
<ClCompile Include="..\src\citymania\cm_bitstream.cpp" />
<ClInclude Include="..\src\citymania\cm_console_cmds.hpp" />
<ClCompile Include="..\src\citymania\cm_console_cmds.cpp" />
<ClInclude Include="..\src\citymania\cm_event.hpp" />
@@ -1383,6 +1385,9 @@
<ClInclude Include="..\src\citymania\cm_main.hpp" />
<ClCompile Include="..\src\citymania\cm_main.cpp" />
<ClInclude Include="..\src\citymania\cm_type.hpp" />
<ClInclude Include="..\src\citymania\cm_saveload.hpp" />
<ClCompile Include="..\src\citymania\cm_saveload.cpp" />
<ClInclude Include="..\src\citymania\cm_settings.hpp" />
<ClInclude Include="..\src\citymania\extensions\cmext_town.hpp" />
<ClInclude Include="..\src\citymania\extensions\cmext_company.hpp" />
</ItemGroup>

15
projects/openttd_vs142.vcxproj.filters
View File

@@ -3213,6 +3213,12 @@
<ClInclude Include="..\src\thread.h">
<Filter>Threading</Filter>
</ClInclude>
<ClInclude Include="..\src\citymania\cm_bitstream.hpp">
<Filter>CityMania</Filter>
</ClInclude>
<ClCompile Include="..\src\citymania\cm_bitstream.cpp">
<Filter>CityMania</Filter>
</ClCompile>
<ClInclude Include="..\src\citymania\cm_console_cmds.hpp">
<Filter>CityMania</Filter>
</ClInclude>
@@ -3243,6 +3249,15 @@
<ClInclude Include="..\src\citymania\cm_type.hpp">
<Filter>CityMania</Filter>
</ClInclude>
<ClInclude Include="..\src\citymania\cm_saveload.hpp">
<Filter>CityMania</Filter>
</ClInclude>
<ClCompile Include="..\src\citymania\cm_saveload.cpp">
<Filter>CityMania</Filter>
</ClCompile>
<ClInclude Include="..\src\citymania\cm_settings.hpp">
<Filter>CityMania</Filter>
</ClInclude>
<ClInclude Include="..\src\citymania\extensions\cmext_town.hpp">
<Filter>CityMania</Filter>
</ClInclude>