diff options
Diffstat (limited to 'projects')
| -rw-r--r-- | projects/generate_vs90.vcproj | 25 | ||||
| -rw-r--r-- | projects/openttd_vs100.vcxproj | 18 | ||||
| -rw-r--r-- | projects/openttd_vs100.vcxproj.filters | 59 | ||||
| -rw-r--r-- | projects/openttd_vs80.vcproj | 96 | ||||
| -rw-r--r-- | projects/openttd_vs90.vcproj | 136 |
5 files changed, 313 insertions, 21 deletions
diff --git a/projects/generate_vs90.vcproj b/projects/generate_vs90.vcproj index dc7b3e2f5..e1e374656 100644 --- a/projects/generate_vs90.vcproj +++ b/projects/generate_vs90.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="9.00" + Version="9,00" Name="generate" ProjectGUID="{2F31FD79-D1AC-43C4-89F3-B0D5E4E53E34}" RootNamespace="generate" @@ -12,14 +12,31 @@ Name="Win32" /> </Platforms> + <ToolFiles> + </ToolFiles> <Configurations> <Configuration Name="Debug|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="..\objs\generate" ConfigurationType="10" > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> </Configuration> </Configurations> + <References> + </References> <Files> <File RelativePath="..\source.list" @@ -29,12 +46,14 @@ > <Tool Name="VCCustomBuildTool" - Description="Running 'generate.vbs' ..." - CommandLine="cscript "$(ProjectDir)generate.vbs"" + Description="Running 'generate.vbs' ..." + CommandLine="cscript "$(ProjectDir)generate.vbs"
" AdditionalDependencies="$(InputPath)" Outputs="$(SolutionDir)openttd_vs80.vcproj;$(SolutionDir)openttd_vs90.vcproj;$(SolutionDir)openttd_vs100.vcxproj;$(SolutionDir)openttd_vs100.vcxproj.filters;$(SolutionDir)langs_vs80.vcproj;$(SolutionDir)langs_vs90.vcproj;$(SolutionDir)langs_vs100.vcxproj" /> </FileConfiguration> </File> </Files> + <Globals> + </Globals> </VisualStudioProject> diff --git a/projects/openttd_vs100.vcxproj b/projects/openttd_vs100.vcxproj index 4ab6f45e7..785145289 100644 --- a/projects/openttd_vs100.vcxproj +++ b/projects/openttd_vs100.vcxproj @@ -296,6 +296,7 @@ <ClCompile Include="..\src\articulated_vehicles.cpp" /> <ClCompile Include="..\src\autoreplace.cpp" /> <ClCompile Include="..\src\bmp.cpp" /> + <ClCompile Include="..\src\cargodest.cpp" /> <ClCompile Include="..\src\cargomonitor.cpp" /> <ClCompile Include="..\src\cargopacket.cpp" /> <ClCompile Include="..\src\cargotype.cpp" /> @@ -371,6 +372,7 @@ <ClCompile Include="..\src\tile_map.cpp" /> <ClCompile Include="..\src\tilearea.cpp" /> <ClCompile Include="..\src\townname.cpp" /> + <ClCompile Include="..\src\trafficlight.cpp" /> <ClCompile Include="..\src\vehicle.cpp" /> <ClCompile Include="..\src\vehiclelist.cpp" /> <ClCompile Include="..\src\viewport.cpp" /> @@ -392,6 +394,10 @@ <ClInclude Include="..\src\bmp.h" /> <ClInclude Include="..\src\bridge.h" /> <ClInclude Include="..\src\cargo_type.h" /> + <ClInclude Include="..\src\cargodest_base.h" /> + <ClInclude Include="..\src\cargodest_func.h" /> + <ClInclude Include="..\src\cargodest_gui.h" /> + <ClInclude Include="..\src\cargodest_type.h" /> <ClInclude Include="..\src\cargomonitor.h" /> <ClInclude Include="..\src\cargopacket.h" /> <ClInclude Include="..\src\cargotype.h" /> @@ -599,6 +605,9 @@ <ClInclude Include="..\src\townname_type.h" /> <ClInclude Include="..\src\track_func.h" /> <ClInclude Include="..\src\track_type.h" /> + <ClInclude Include="..\src\trafficlight.h" /> + <ClInclude Include="..\src\trafficlight_func.h" /> + <ClInclude Include="..\src\trafficlight_type.h" /> <ClInclude Include="..\src\train.h" /> <ClInclude Include="..\src\transparency.h" /> <ClInclude Include="..\src\transparency_gui.h" /> @@ -656,6 +665,7 @@ <ClCompile Include="..\src\bootstrap_gui.cpp" /> <ClCompile Include="..\src\bridge_gui.cpp" /> <ClCompile Include="..\src\build_vehicle_gui.cpp" /> + <ClCompile Include="..\src\cargodest_gui.cpp" /> <ClCompile Include="..\src\cheat_gui.cpp" /> <ClCompile Include="..\src\company_gui.cpp" /> <ClCompile Include="..\src\console_gui.cpp" /> @@ -792,6 +802,7 @@ <ClCompile Include="..\src\saveload\airport_sl.cpp" /> <ClCompile Include="..\src\saveload\animated_tile_sl.cpp" /> <ClCompile Include="..\src\saveload\autoreplace_sl.cpp" /> + <ClCompile Include="..\src\saveload\cargodest_sl.cpp" /> <ClCompile Include="..\src\saveload\cargomonitor_sl.cpp" /> <ClCompile Include="..\src\saveload\cargopacket_sl.cpp" /> <ClCompile Include="..\src\saveload\cheat_sl.cpp" /> @@ -1187,6 +1198,7 @@ <ClInclude Include="..\src\pathfinder\yapf\yapf.hpp" /> <ClInclude Include="..\src\pathfinder\yapf\yapf_base.hpp" /> <ClInclude Include="..\src\pathfinder\yapf\yapf_cache.h" /> + <ClCompile Include="..\src\pathfinder\yapf\yapf_cargo.cpp" /> <ClInclude Include="..\src\pathfinder\yapf\yapf_common.hpp" /> <ClInclude Include="..\src\pathfinder\yapf\yapf_costbase.hpp" /> <ClInclude Include="..\src\pathfinder\yapf\yapf_costcache.hpp" /> @@ -1214,6 +1226,12 @@ <ClCompile Include="..\src\os\windows\win32.cpp" /> <ClInclude Include="..\src\thread\thread.h" /> <ClCompile Include="..\src\thread\thread_win32.cpp" /> + <ClCompile Include="..\src\layer.cpp" /> + <ClCompile Include="..\src\underground_gui.cpp" /> + <ClInclude Include="..\src\layer_type.h" /> + <ClInclude Include="..\src\layer_func.h" /> + <ClInclude Include="..\src\underground_gui.h" /> + <ClInclude Include="..\src\widgets\underground_widget.h" /> </ItemGroup> <ItemGroup> <None Include="..\media\openttd.ico" /> diff --git a/projects/openttd_vs100.vcxproj.filters b/projects/openttd_vs100.vcxproj.filters index 34a8b4d00..963c23f89 100644 --- a/projects/openttd_vs100.vcxproj.filters +++ b/projects/openttd_vs100.vcxproj.filters @@ -100,6 +100,9 @@ <Filter Include="Threading"> <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000032}</UniqueIdentifier> </Filter> + <Filter Include="underground"> + <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000033}</UniqueIdentifier> + </Filter> </ItemGroup> <ItemGroup> <ClCompile Include="..\src\airport.cpp"> @@ -117,6 +120,9 @@ <ClCompile Include="..\src\bmp.cpp"> <Filter>Source Files</Filter> </ClCompile> + <ClCompile Include="..\src\cargodest.cpp"> + <Filter>Source Files</Filter> + </ClCompile> <ClCompile Include="..\src\cargomonitor.cpp"> <Filter>Source Files</Filter> </ClCompile> @@ -342,7 +348,10 @@ <ClCompile Include="..\src\townname.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\src\vehicle.cpp"> + <ClCompile Include="..\src\townname.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\src\trafficlight.cpp"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="..\src\vehiclelist.cpp"> @@ -405,6 +414,18 @@ <ClInclude Include="..\src\cargo_type.h"> <Filter>Header Files</Filter> </ClInclude> + <ClInclude Include="..\src\cargodest_base.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\src\cargodest_func.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\src\cargodest_gui.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\src\cargodest_type.h"> + <Filter>Header Files</Filter> + </ClInclude> <ClInclude Include="..\src\cargomonitor.h"> <Filter>Header Files</Filter> </ClInclude> @@ -1026,6 +1047,15 @@ <ClInclude Include="..\src\track_type.h"> <Filter>Header Files</Filter> </ClInclude> + <ClInclude Include="..\src\trafficlight.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\src\trafficlight_func.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\src\trafficlight_type.h"> + <Filter>Header Files</Filter> + </ClInclude> <ClInclude Include="..\src\train.h"> <Filter>Header Files</Filter> </ClInclude> @@ -1197,6 +1227,9 @@ <ClCompile Include="..\src\build_vehicle_gui.cpp"> <Filter>GUI Source Code</Filter> </ClCompile> + <ClCompile Include="..\src\cargodest_gui.cpp"> + <Filter>GUI Source Code</Filter> + </ClCompile> <ClCompile Include="..\src\cheat_gui.cpp"> <Filter>GUI Source Code</Filter> </ClCompile> @@ -1605,6 +1638,9 @@ <ClCompile Include="..\src\saveload\autoreplace_sl.cpp"> <Filter>Save/Load handlers</Filter> </ClCompile> + <ClCompile Include="..\src\saveload\cargodest_sl.cpp"> + <Filter>Save/Load handlers</Filter> + </ClCompile> <ClCompile Include="..\src\saveload\cargomonitor_sl.cpp"> <Filter>Save/Load handlers</Filter> </ClCompile> @@ -2790,6 +2826,9 @@ <ClInclude Include="..\src\pathfinder\yapf\yapf_cache.h"> <Filter>YAPF</Filter> </ClInclude> + <ClCompile Include="..\src\pathfinder\yapf\yapf_cargo.cpp"> + <Filter>YAPF</Filter> + </ClCompile> <ClInclude Include="..\src\pathfinder\yapf\yapf_common.hpp"> <Filter>YAPF</Filter> </ClInclude> @@ -2871,6 +2910,24 @@ <ClCompile Include="..\src\thread\thread_win32.cpp"> <Filter>Threading</Filter> </ClCompile> + <ClCompile Include="..\src\layer.cpp"> + <Filter>underground</Filter> + </ClCompile> + <ClCompile Include="..\src\underground_gui.cpp"> + <Filter>underground</Filter> + </ClCompile> + <ClInclude Include="..\src\layer_type.h"> + <Filter>underground</Filter> + </ClInclude> + <ClInclude Include="..\src\layer_func.h"> + <Filter>underground</Filter> + </ClInclude> + <ClInclude Include="..\src\underground_gui.h"> + <Filter>underground</Filter> + </ClInclude> + <ClInclude Include="..\src\widgets\underground_widget.h"> + <Filter>underground</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <None Include="..\media\openttd.ico" /> diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj index c6e3e595f..6cf74a447 100644 --- a/projects/openttd_vs80.vcproj +++ b/projects/openttd_vs80.vcproj @@ -455,6 +455,10 @@ > </File> <File + RelativePath=".\..\src\cargodest.cpp" + > + </File> + <File RelativePath=".\..\src\cargomonitor.cpp" > </File> @@ -503,6 +507,10 @@ > </File> <File + RelativePath=".\..\src\departures.cpp" + > + </File> + <File RelativePath=".\..\src\depot.cpp" > </File> @@ -755,6 +763,10 @@ > </File> <File + RelativePath=".\..\src\trafficlight.cpp" + > + </File> + <File RelativePath=".\..\src\vehicle.cpp" > </File> @@ -843,6 +855,22 @@ > </File> <File + RelativePath=".\..\src\cargodest_base.h" + > + </File> + <File + RelativePath=".\..\src\cargodest_func.h" + > + </File> + <File + RelativePath=".\..\src\cargodest_gui.h" + > + </File> + <File + RelativePath=".\..\src\cargodest_type.h" + > + </File> + <File RelativePath=".\..\src\cargomonitor.h" > </File> @@ -943,6 +971,18 @@ > </File> <File + RelativePath=".\..\src\departures_func.h" + > + </File> + <File + RelativePath=".\..\src\departures_gui.h" + > + </File> + <File + RelativePath=".\..\src\departures_type.h" + > + </File> + <File RelativePath=".\..\src\depot_base.h" > </File> @@ -1671,6 +1711,18 @@ > </File> <File + RelativePath=".\..\src\trafficlight.h" + > + </File> + <File + RelativePath=".\..\src\trafficlight_func.h" + > + </File> + <File + RelativePath=".\..\src\trafficlight_type.h" + > + </File> + <File RelativePath=".\..\src\train.h" > </File> @@ -1907,6 +1959,10 @@ > </File> <File + RelativePath=".\..\src\cargodest_gui.cpp" + > + </File> + <File RelativePath=".\..\src\cheat_gui.cpp" > </File> @@ -1923,6 +1979,10 @@ > </File> <File + RelativePath=".\..\src\departures_gui.cpp" + > + </File> + <File RelativePath=".\..\src\depot_gui.cpp" > </File> @@ -2463,6 +2523,10 @@ > </File> <File + RelativePath=".\..\src\saveload\cargodest_sl.cpp" + > + </File> + <File RelativePath=".\..\src\saveload\cargomonitor_sl.cpp" > </File> @@ -4127,6 +4191,10 @@ > </File> <File + RelativePath=".\..\src\pathfinder\yapf\yapf_cargo.cpp" + > + </File> + <File RelativePath=".\..\src\pathfinder\yapf\yapf_common.hpp" > </File> @@ -4255,6 +4323,34 @@ > </File> </Filter> + <Filter + Name="underground" + > + <File + RelativePath=".\..\src\layer.cpp" + > + </File> + <File + RelativePath=".\..\src\underground_gui.cpp" + > + </File> + <File + RelativePath=".\..\src\layer_type.h" + > + </File> + <File + RelativePath=".\..\src\layer_func.h" + > + </File> + <File + RelativePath=".\..\src\underground_gui.h" + > + </File> + <File + RelativePath=".\..\src\widgets\underground_widget.h" + > + </File> + </Filter> <File RelativePath=".\..\media\openttd.ico" > diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj index b5155a469..112ab33c6 100644 --- a/projects/openttd_vs90.vcproj +++ b/projects/openttd_vs90.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="9.00" + Version="9,00" Name="openttd" ProjectGUID="{668328A0-B40E-4CDB-BD72-D0064424414A}" RootNamespace="openttd" @@ -15,6 +15,8 @@ Name="x64" /> </Platforms> + <ToolFiles> + </ToolFiles> <Configurations> <Configuration Name="Release|Win32" @@ -452,6 +454,10 @@ > </File> <File + RelativePath=".\..\src\cargodest.cpp" + > + </File> + <File RelativePath=".\..\src\cargomonitor.cpp" > </File> @@ -500,6 +506,10 @@ > </File> <File + RelativePath=".\..\src\departures.cpp" + > + </File> + <File RelativePath=".\..\src\depot.cpp" > </File> @@ -752,6 +762,10 @@ > </File> <File + RelativePath=".\..\src\trafficlight.cpp" + > + </File> + <File RelativePath=".\..\src\vehicle.cpp" > </File> @@ -775,6 +789,22 @@ RelativePath=".\..\src\window.cpp" > </File> + <Filter + Name="Sound" + > + <File + RelativePath=".\..\src\sound\null_s.cpp" + > + </File> + <File + RelativePath=".\..\src\sound\sdl_s.cpp" + > + </File> + <File + RelativePath=".\..\src\sound\win32_s.cpp" + > + </File> + </Filter> </Filter> <Filter Name="Header Files" @@ -840,6 +870,22 @@ > </File> <File + RelativePath=".\..\src\cargodest_base.h" + > + </File> + <File + RelativePath=".\..\src\cargodest_func.h" + > + </File> + <File + RelativePath=".\..\src\cargodest_gui.h" + > + </File> + <File + RelativePath=".\..\src\cargodest_type.h" + > + </File> + <File RelativePath=".\..\src\cargomonitor.h" > </File> @@ -940,6 +986,18 @@ > </File> <File + RelativePath=".\..\src\departures_func.h" + > + </File> + <File + RelativePath=".\..\src\departures_gui.h" + > + </File> + <File + RelativePath=".\..\src\departures_type.h" + > + </File> + <File RelativePath=".\..\src\depot_base.h" > </File> @@ -1668,6 +1726,18 @@ > </File> <File + RelativePath=".\..\src\trafficlight.h" + > + </File> + <File + RelativePath=".\..\src\trafficlight_func.h" + > + </File> + <File + RelativePath=".\..\src\trafficlight_type.h" + > + </File> + <File RelativePath=".\..\src\train.h" > </File> @@ -1904,6 +1974,10 @@ > </File> <File + RelativePath=".\..\src\cargodest_gui.cpp" + > + </File> + <File RelativePath=".\..\src\cheat_gui.cpp" > </File> @@ -1920,6 +1994,10 @@ > </File> <File + RelativePath=".\..\src\departures_gui.cpp" + > + </File> + <File RelativePath=".\..\src\depot_gui.cpp" > </File> @@ -2104,11 +2182,11 @@ Name="Widgets" > <File - RelativePath=".\..\src\widgets\airport_widget.h" + RelativePath=".\..\src\widgets\ai_widget.h" > </File> <File - RelativePath=".\..\src\widgets\ai_widget.h" + RelativePath=".\..\src\widgets\airport_widget.h" > </File> <File @@ -2460,6 +2538,10 @@ > </File> <File + RelativePath=".\..\src\saveload\cargodest_sl.cpp" + > + </File> + <File RelativePath=".\..\src\saveload\cargomonitor_sl.cpp" > </File> @@ -4124,6 +4206,10 @@ > </File> <File + RelativePath=".\..\src\pathfinder\yapf\yapf_cargo.cpp" + > + </File> + <File RelativePath=".\..\src\pathfinder\yapf\yapf_common.hpp" > </File> @@ -4209,50 +4295,66 @@ </File> </Filter> <Filter - Name="Sound" + Name="Windows files" > <File - RelativePath=".\..\src\sound\null_s.cpp" + RelativePath=".\..\src\os\windows\crashlog_win.cpp" > </File> <File - RelativePath=".\..\src\sound\sdl_s.cpp" + RelativePath=".\..\src\os\windows\ottdres.rc" > </File> <File - RelativePath=".\..\src\sound\win32_s.cpp" + RelativePath=".\..\src\os\windows\win32.cpp" > </File> </Filter> <Filter - Name="Windows files" + Name="Threading" > <File - RelativePath=".\..\src\os\windows\crashlog_win.cpp" - > - </File> - <File - RelativePath=".\..\src\os\windows\ottdres.rc" + RelativePath=".\..\src\thread\thread.h" > </File> <File - RelativePath=".\..\src\os\windows\win32.cpp" + RelativePath=".\..\src\thread\thread_win32.cpp" > </File> </Filter> <Filter - Name="Threading" + Name="underground" > <File - RelativePath=".\..\src\thread\thread.h" + RelativePath=".\..\src\layer.cpp" > </File> <File - RelativePath=".\..\src\thread\thread_win32.cpp" + RelativePath=".\..\src\layer_func.h" + > + </File> + <File + RelativePath=".\..\src\layer_type.h" + > + </File> + <File + RelativePath=".\..\src\underground_gui.cpp" + > + </File> + <File + RelativePath=".\..\src\underground_gui.h" + > + </File> + <File + RelativePath=".\..\src\widgets\underground_widget.h" > </File> </Filter> <File + RelativePath="..\layer.txt" + > + </File> + <File RelativePath=".\..\media\openttd.ico" > </File> |