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

Merge branch 'tracerestrict' into tracerestrict-sx

Browse Source
This commit is contained in:
Jonathan G Rennison
2016-06-30 20:15:27 +01:00
parent fe1fee456a f942de699c
commit e4b932d53a
13 changed files with 360 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
projects/openttd_vs100.vcxproj
View File

@@ -654,6 +654,7 @@
<ClInclude Include="..\src\os\windows\win32.h" />
<ClInclude Include="..\src\music\win32_m.h" />
<ClInclude Include="..\src\sound\win32_s.h" />
<ClInclude Include="..\src\unit_conversion.h" />
<ClInclude Include="..\src\video\win32_v.h" />
<ClInclude Include="..\src\window_func.h" />
<ClInclude Include="..\src\window_gui.h" />

3
projects/openttd_vs100.vcxproj.filters
View File

@@ -1191,6 +1191,9 @@
<ClInclude Include="..\src\sound\win32_s.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\unit_conversion.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\video\win32_v.h">
<Filter>Header Files</Filter>
</ClInclude>

5
projects/openttd_vs140.vcxproj
View File

@@ -671,6 +671,7 @@
<ClInclude Include="..\src\os\windows\win32.h" />
<ClInclude Include="..\src\music\win32_m.h" />
<ClInclude Include="..\src\sound\win32_s.h" />
<ClInclude Include="..\src\unit_conversion.h" />
<ClInclude Include="..\src\video\win32_v.h" />
<ClInclude Include="..\src\window_func.h" />
<ClInclude Include="..\src\window_gui.h" />
@@ -1290,6 +1291,10 @@
<ClCompile Include="..\src\os\windows\win32.cpp" />
<ClInclude Include="..\src\thread\thread.h" />
<ClCompile Include="..\src\thread\thread_win32.cpp" />
<ClInclude Include="..\src\tracerestrict.h" />
<ClCompile Include="..\src\tracerestrict.cpp" />
<ClCompile Include="..\src\tracerestrict_gui.cpp" />
<ClCompile Include="..\src\saveload\tracerestrict_sl.cpp" />
</ItemGroup>
<ItemGroup>
<None Include="..\media\openttd.ico" />

15
projects/openttd_vs140.vcxproj.filters
View File

@@ -1191,6 +1191,9 @@
<ClInclude Include="..\src\sound\win32_s.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\unit_conversion.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\video\win32_v.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -3048,6 +3051,18 @@
<ClCompile Include="..\src\thread\thread_win32.cpp">
<Filter>Threading</Filter>
</ClCompile>
<ClInclude Include="..\src\tracerestrict.h">
<Filter>Threading</Filter>
</ClInclude>
<ClCompile Include="..\src\tracerestrict.cpp">
<Filter>Threading</Filter>
</ClCompile>
<ClCompile Include="..\src\tracerestrict_gui.cpp">
<Filter>Threading</Filter>
</ClCompile>
<ClCompile Include="..\src\saveload\tracerestrict_sl.cpp">
<Filter>Threading</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="..\media\openttd.ico" />

4
projects/openttd_vs80.vcproj
View File

@@ -1890,6 +1890,10 @@
RelativePath=".\..\src\sound\win32_s.h"
>
</File>
<File
RelativePath=".\..\src\unit_conversion.h"
>
</File>
<File
RelativePath=".\..\src\video\win32_v.h"
>

4
projects/openttd_vs90.vcproj
View File

@@ -1887,6 +1887,10 @@
RelativePath=".\..\src\sound\win32_s.h"
>
</File>
<File
RelativePath=".\..\src\unit_conversion.h"
>
</File>
<File
RelativePath=".\..\src\video\win32_v.h"
>