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

Merge branch 'cpp-11' into save_ext

Browse Source 
# Conflicts:
#	config.lib
#	src/saveload/saveload.cpp
This commit is contained in:
Jonathan G Rennison
2019-01-06 22:10:04 +00:00
parent 373ff3dd4e 962a9c5430
commit 0dba091d79
375 changed files with 6874 additions and 8226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
projects/openttd_vs100.vcxproj.filters
View File

@@ -864,12 +864,6 @@
<ClInclude Include="..\src\news_type.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\music\midi.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\music\midifile.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\music\null_m.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -1053,9 +1047,6 @@
<ClInclude Include="..\src\string_type.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\os\windows\string_uniscribe.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\stringfilter_type.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -1215,9 +1206,6 @@
<ClInclude Include="..\src\window_type.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\sound\xaudio2_s.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\zoom_func.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -2625,12 +2613,6 @@
<ClInclude Include="..\src\blitter\32bpp_anim.hpp">
<Filter>Blitters</Filter>
</ClInclude>
<ClCompile Include="..\src\blitter\32bpp_anim_sse2.cpp">
<Filter>Blitters</Filter>
</ClCompile>
<ClInclude Include="..\src\blitter\32bpp_anim_sse2.hpp">
<Filter>Blitters</Filter>
</ClInclude>
<ClCompile Include="..\src\blitter\32bpp_anim_sse4.cpp">
<Filter>Blitters</Filter>
</ClCompile>
@@ -3063,9 +3045,6 @@
<ClCompile Include="..\src\music\null_m.cpp">
<Filter>Music</Filter>
</ClCompile>
<ClCompile Include="..\src\music\midifile.cpp">
<Filter>Music</Filter>
</ClCompile>
<ClCompile Include="..\src\music\win32_m.cpp">
<Filter>Music</Filter>
</ClCompile>
@@ -3078,18 +3057,12 @@
<ClCompile Include="..\src\sound\win32_s.cpp">
<Filter>Sound</Filter>
</ClCompile>
<ClCompile Include="..\src\sound\xaudio2_s.cpp">
<Filter>Sound</Filter>
</ClCompile>
<ClCompile Include="..\src\os\windows\crashlog_win.cpp">
<Filter>Windows files</Filter>
</ClCompile>
<ResourceCompile Include="..\src\os\windows\ottdres.rc">
<Filter>Windows files</Filter>
</ResourceCompile>
<ClCompile Include="..\src\os\windows\string_uniscribe.cpp">
<Filter>Windows files</Filter>
</ClCompile>
<ClCompile Include="..\src\os\windows\win32.cpp">
<Filter>Windows files</Filter>
</ClCompile>