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

Merge branch 'master' into cpp-11

Browse Source
This commit is contained in:
Jonathan G Rennison
2019-02-04 18:09:36 +00:00
parent d86aa7719b 33e3f49161
commit 09c62d6951
309 changed files with 13187 additions and 4835 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
projects/openttd_vs141.vcxproj
View File

@@ -1204,8 +1204,8 @@
<ClInclude Include="..\src\blitter\8bpp_optimized.hpp" />
<ClCompile Include="..\src\blitter\8bpp_simple.cpp" />
<ClInclude Include="..\src\blitter\8bpp_simple.hpp" />
<ClCompile Include="..\src\blitter\base.cpp" />
<ClInclude Include="..\src\blitter\base.hpp" />
<ClInclude Include="..\src\blitter\common.hpp" />
<ClInclude Include="..\src\blitter\factory.hpp" />
<ClCompile Include="..\src\blitter\null.cpp" />
<ClInclude Include="..\src\blitter\null.hpp" />
@@ -1348,6 +1348,14 @@
<Project>{0f066b23-18df-4284-8265-f4a5e7e3b966}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="settingsgen_vs141.vcxproj">
<Project>{e9548de9-f089-49b7-93a6-30be2cc311c7}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="settings_vs141.vcxproj">
<Project>{0817f629-589e-4a3b-b81a-8647bc571e35}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="strgen_vs141.vcxproj">
<Project>{a133a442-bd0a-4ade-b117-ad7545e4bdd1}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
@@ -1356,6 +1364,10 @@
<Project>{1a2b3c5e-1c23-41a5-9c9b-acba2aa75fec}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="basesets_vs141.vcxproj">
<Project>{e12e77ca-c0f1-4ada-943f-4929274249d3}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</Project>