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:
#	findversion.sh
This commit is contained in:
Jonathan G Rennison
2018-04-27 01:33:39 +01:00
parent c2ab4cb2ae b90c5b9618
commit 4bcd05a620
119 changed files with 2250 additions and 1094 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
projects/openttd_vs80.vcproj
View File

@@ -122,6 +122,8 @@
/>
<Tool
Name="VCPostBuildEventTool"
Description=""
CommandLine="copy &quot;$(OutDir)$(TargetName)$(TargetExt)&quot; &quot;$(SolutionDir)..\bin\$(TargetName)$(TargetExt)&quot;"
/>
</Configuration>
<Configuration
@@ -217,6 +219,8 @@
/>
<Tool
Name="VCPostBuildEventTool"
Description=""
CommandLine="copy &quot;$(OutDir)$(TargetName)$(TargetExt)&quot; &quot;$(SolutionDir)..\bin\$(TargetName)$(TargetExt)&quot;"
/>
</Configuration>
<Configuration
@@ -327,6 +331,8 @@
/>
<Tool
Name="VCPostBuildEventTool"
Description=""
CommandLine="copy &quot;$(OutDir)$(TargetName)$(TargetExt)&quot; &quot;$(SolutionDir)..\bin\$(TargetName)$(TargetExt)&quot;"
/>
</Configuration>
<Configuration
@@ -425,6 +431,8 @@
/>
<Tool
Name="VCPostBuildEventTool"
Description=""
CommandLine="copy &quot;$(OutDir)$(TargetName)$(TargetExt)&quot; &quot;$(SolutionDir)..\bin\$(TargetName)$(TargetExt)&quot;"
/>
</Configuration>
</Configurations>
@@ -3346,6 +3354,14 @@
RelativePath=".\..\src\script\api\script_cargomonitor.hpp"
>
</File>
<File
RelativePath=".\..\src\script\api\script_client.hpp"
>
</File>
<File
RelativePath=".\..\src\script\api\script_clientlist.hpp"
>
</File>
<File
RelativePath=".\..\src\script\api\script_company.hpp"
>
@@ -3610,6 +3626,14 @@
RelativePath=".\..\src\script\api\script_cargomonitor.cpp"
>
</File>
<File
RelativePath=".\..\src\script\api\script_client.cpp"
>
</File>
<File
RelativePath=".\..\src\script\api\script_clientlist.cpp"
>
</File>
<File
RelativePath=".\..\src\script\api\script_company.cpp"
>
@@ -4508,7 +4532,7 @@
>
</File>
<File
RelativePath=".\..\readme.txt"
RelativePath=".\..\README.md"
>
</File>
</Files>