(svn r7759) -Merge: makefile rewrite. This merge features:

 - A proper ./configure, so everything needs to be configured only once, not for every make.
 - Usage of makedepend when available. This greatly reduces the time needed for generating the dependencies.
 - A generator for all project files. There is a single file with sources, which is used to generate Makefiles and the project files for MSVC.
 - Proper support for OSX universal binaries.
 - Object files for non-MSVC compiles are also placed in separate directories, making is faster to switch between debug and release compiles and it does not touch the directory with the source files.
 - Functionality to make a bundle of all needed files for for example a nightly or distribution of a binary with all needed GRFs and language files.

Note: as this merge moves almost all files, it is recommended to make a backup of your working copy before updating your working copy.

1 files changed, 0 insertions, 1227 deletions

diff --git a/openttd.vcproj b/openttd.vcproj
deleted file mode 100644
index a2b99aa1f..000000000
--- a/openttd.vcproj
+++ /dev/null
@@ -1,1227 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="openttd"
-	SccProjectName=""
-	SccLocalPath="">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="1"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				GlobalOptimizations="TRUE"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="TRUE"
-				OptimizeForProcessor="1"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK"
-				StringPooling="TRUE"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="3"
-				BufferSecurityCheck="FALSE"
-				EnableFunctionLevelLinking="TRUE"
-				DefaultCharIsUnsigned="TRUE"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderThrough=""
-				PrecompiledHeaderFile=""
-				AssemblerOutput="2"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="3"
-				CallingConvention="1"
-				CompileAs="1"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="unicows.lib winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib"
-				OutputFile=".\Release/openttd.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				IgnoreDefaultLibraryNames=""
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\Release/openttd.pdb"
-				SubSystem="2"
-				OptimizeReferences="2"
-				OptimizeForWindows98="1"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Release/openttd.tlb"
-				HeaderFileName=""/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1053"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\Debug/openttd.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
-				WarningLevel="3"
-				WarnAsError="TRUE"
-				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"
-				CallingConvention="1"
-				CompileAs="1"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="unicows.lib winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib"
-				OutputFile=".\Debug/openttd.exe"
-				LinkIncremental="0"
-				SuppressStartupBanner="TRUE"
-				IgnoreDefaultLibraryNames="LIBCMT.lib"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\Debug/openttd.pdb"
-				SubSystem="2"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Debug/openttd.tlb"
-				HeaderFileName=""/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1053"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
-			<File
-				RelativePath=".\airport.c">
-			</File>
-			<File
-				RelativePath=".\aystar.c">
-			</File>
-			<File
-				RelativePath=".\bmp.c">
-			</File>
-			<File
-				RelativePath=".\callback_table.c">
-			</File>
-			<File
-				RelativePath=".\command.c">
-			</File>
-			<File
-				RelativePath=".\console.c">
-			</File>
-			<File
-				RelativePath=".\console_cmds.c">
-			</File>
-			<File
-				RelativePath=".\currency.c">
-			</File>
-			<File
-				RelativePath=".\date.c">
-			</File>
-			<File
-				RelativePath=".\debug.c">
-			</File>
-			<File
-				RelativePath=".\dedicated.c">
-			</File>
-			<File
-				RelativePath=".\video\dedicated_v.c">
-			</File>
-			<File
-				RelativePath=".\depot.c">
-			</File>
-			<File
-				RelativePath=".\music\dmusic.cpp">
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="2"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="2"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\driver.c">
-			</File>
-			<File
-				RelativePath=".\economy.c">
-			</File>
-			<File
-				RelativePath=".\elrail.c">
-			</File>
-			<File
-				RelativePath=".\engine.c">
-			</File>
-			<File
-				RelativePath=".\fileio.c">
-			</File>
-			<File
-				RelativePath=".\fios.c">
-			</File>
-			<File
-				RelativePath=".\fontcache.c">
-			</File>
-			<File
-				RelativePath=".\genworld.c">
-			</File>
-			<File
-				RelativePath=".\gfx.c">
-			</File>
-			<File
-				RelativePath=".\gfxinit.c">
-			</File>
-			<File
-				RelativePath=".\heightmap.c">
-			</File>
-			<File
-				RelativePath=".\helpers.cpp">
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="2"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="2"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\landscape.c">
-			</File>
-			<File
-				RelativePath=".\map.c">
-			</File>
-			<File
-				RelativePath=".\md5.c">
-			</File>
-			<File
-				RelativePath=".\mersenne.c">
-			</File>
-			<File
-				RelativePath=".\minilzo.c">
-			</File>
-			<File
-				RelativePath=".\misc.c">
-			</File>
-			<File
-				RelativePath=".\mixer.c">
-			</File>
-			<File
-				RelativePath=".\music.c">
-			</File>
-			<File
-				RelativePath=".\namegen.c">
-			</File>
-			<File
-				RelativePath=".\network\core\packet.c">
-			</File>
-			<File
-				RelativePath=".\network\core\tcp.c">
-			</File>
-			<File
-				RelativePath=".\network\core\udp.c">
-			</File>
-			<File
-				RelativePath=".\network\network.c">
-			</File>
-			<File
-				RelativePath=".\network\network_client.c">
-			</File>
-			<File
-				RelativePath=".\network\network_data.c">
-			</File>
-			<File
-				RelativePath=".\network\network_gamelist.c">
-			</File>
-			<File
-				RelativePath=".\network\network_server.c">
-			</File>
-			<File
-				RelativePath=".\network\network_udp.c">
-			</File>
-			<File
-				RelativePath=".\newgrf.c">
-			</File>
-			<File
-				RelativePath=".\newgrf_cargo.c">
-			</File>
-			<File
-				RelativePath=".\newgrf_config.c">
-			</File>
-			<File
-				RelativePath=".\newgrf_engine.c">
-			</File>
-			<File
-				RelativePath=".\newgrf_sound.c">
-			</File>
-			<File
-				RelativePath=".\newgrf_spritegroup.c">
-			</File>
-			<File
-				RelativePath=".\newgrf_station.c">
-			</File>
-			<File
-				RelativePath=".\newgrf_text.c">
-			</File>
-			<File
-				RelativePath=".\npf.c">
-			</File>
-			<File
-				RelativePath=".\music\null_m.c">
-			</File>
-			<File
-				RelativePath=".\sound\null_s.c">
-			</File>
-			<File
-				RelativePath=".\video\null_v.c">
-			</File>
-			<File
-				RelativePath=".\oldloader.c">
-			</File>
-			<File
-				RelativePath=".\openttd.c">
-			</File>
-			<File
-				RelativePath=".\os_timer.c">
-			</File>
-			<File
-				RelativePath=".\ottdres.rc">
-			</File>
-			<File
-				RelativePath=".\pathfind.c">
-			</File>
-			<File
-				RelativePath="players.c">
-			</File>
-			<File
-				RelativePath=".\oldpool.c">
-			</File>
-			<File
-				RelativePath=".\queue.c">
-			</File>
-			<File
-				RelativePath=".\rail.c">
-			</File>
-			<File
-				RelativePath=".\saveload.c">
-			</File>
-			<File
-				RelativePath=".\screenshot.c">
-			</File>
-			<File
-				RelativePath=".\sdl.c">
-			</File>
-			<File
-				RelativePath=".\sound\sdl_s.c">
-			</File>
-			<File
-				RelativePath=".\video\sdl_v.c">
-			</File>
-			<File
-				RelativePath=".\settings.c">
-			</File>
-			<File
-				RelativePath=".\signs.c">
-			</File>
-			<File
-				RelativePath=".\sound.c">
-			</File>
-			<File
-				RelativePath=".\spritecache.c">
-			</File>
-			<File
-				RelativePath=".\string.c">
-			</File>
-			<File
-				RelativePath=".\strings.c">
-			</File>
-			<File
-				RelativePath=".\texteff.c">
-			</File>
-			<File
-				RelativePath=".\tgp.c">
-			</File>
-			<File
-				RelativePath=".\thread.c">
-			</File>
-			<File
-				RelativePath=".\tile.c">
-			</File>
-			<File
-				RelativePath=".\vehicle.c">
-			</File>
-			<File
-				RelativePath=".\viewport.c">
-			</File>
-			<File
-				RelativePath=".\waypoint.c">
-			</File>
-			<File
-				RelativePath=".\widget.c">
-			</File>
-			<File
-				RelativePath=".\win32.c">
-			</File>
-			<File
-				RelativePath=".\music\win32_m.c">
-			</File>
-			<File
-				RelativePath=".\sound\win32_s.c">
-			</File>
-			<File
-				RelativePath=".\video\win32_v.c">
-			</File>
-			<File
-				RelativePath=".\window.c">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
-			<File
-				RelativePath=".\aircraft.h">
-			</File>
-			<File
-				RelativePath=".\airport.h">
-			</File>
-			<File
-				RelativePath=".\airport_movement.h">
-			</File>
-			<File
-				RelativePath=".\aystar.h">
-			</File>
-			<File
-				RelativePath=".\bmp.h">
-			</File>
-			<File
-				RelativePath=".\command.h">
-			</File>
-			<File
-				RelativePath=".\console.h">
-			</File>
-			<File
-				RelativePath=".\currency.h">
-			</File>
-			<File
-				RelativePath=".\date.h">
-			</File>
-			<File
-				RelativePath=".\debug.h">
-			</File>
-			<File
-				RelativePath=".\video\dedicated_v.h">
-			</File>
-			<File
-				RelativePath=".\depot.h">
-			</File>
-			<File
-				RelativePath=".\music\dmusic.h">
-			</File>
-			<File
-				RelativePath=".\driver.h">
-			</File>
-			<File
-				RelativePath=".\economy.h">
-			</File>
-			<File
-				RelativePath=".\engine.h">
-			</File>
-			<File
-				RelativePath=".\fileio.h">
-			</File>
-			<File
-				RelativePath=".\fontcache.h">
-			</File>
-			<File
-				RelativePath=".\functions.h">
-			</File>
-			<File
-				RelativePath=".\genworld.h">
-			</File>
-			<File
-				RelativePath=".\gfx.h">
-			</File>
-			<File
-				RelativePath=".\gfxinit.h">
-			</File>
-			<File
-				RelativePath=".\gui.h">
-			</File>
-			<File
-				RelativePath=".\hal.h">
-			</File>
-			<File
-				RelativePath=".\heightmap.h">
-			</File>
-			<File
-				RelativePath=".\industry.h">
-			</File>
-			<File
-				RelativePath=".\macros.h">
-			</File>
-			<File
-				RelativePath=".\map.h">
-			</File>
-			<File
-				RelativePath=".\md5.h">
-			</File>
-			<File
-				RelativePath=".\mixer.h">
-			</File>
-			<File
-				RelativePath=".\music.h">
-			</File>
-			<File
-				RelativePath=".\network\core\config.h">
-			</File>
-			<File
-				RelativePath=".\network\core\game.h">
-			</File>
-			<File
-				RelativePath=".\network\core\os_abstraction.h">
-			</File>
-			<File
-				RelativePath=".\network\core\packet.h">
-			</File>
-			<File
-				RelativePath=".\network\core\tcp.h">
-			</File>
-			<File
-				RelativePath=".\network\core\udp.h">
-			</File>
-			<File
-				RelativePath=".\network\network.h">
-			</File>
-			<File
-				RelativePath=".\network\network_client.h">
-			</File>
-			<File
-				RelativePath=".\network\network_data.h">
-			</File>
-			<File
-				RelativePath=".\network\network_gamelist.h">
-			</File>
-			<File
-				RelativePath=".\network\network_gui.h">
-			</File>
-			<File
-				RelativePath=".\network_server.h">
-			</File>
-			<File
-				RelativePath=".\network_udp.h">
-			</File>
-			<File
-				RelativePath=".\newgrf.h">
-			</File>
-			<File
-				RelativePath=".\newgrf_callbacks.h">
-			</File>
-			<File
-				RelativePath=".\newgrf_cargo.h">
-			</File>
-			<File
-				RelativePath=".\newgrf_config.h">
-			</File>
-			<File
-				RelativePath=".\newgrf_engine.h">
-			</File>
-			<File
-				RelativePath=".\newgrf_sound.h">
-			</File>
-			<File
-				RelativePath=".\newgrf_spritegroup.h">
-			</File>
-			<File
-				RelativePath=".\newgrf_station.h">
-			</File>
-			<File
-				RelativePath=".\newgrf_text.h">
-			</File>
-			<File
-				RelativePath=".\news.h">
-			</File>
-			<File
-				RelativePath=".\npf.h">
-			</File>
-			<File
-				RelativePath=".\music\null_m.h">
-			</File>
-			<File
-				RelativePath=".\sound\null_s.h">
-			</File>
-			<File
-				RelativePath=".\video\null_v.h">
-			</File>
-			<File
-				RelativePath=".\openttd.h">
-			</File>
-			<File
-				RelativePath=".\pathfind.h">
-			</File>
-			<File
-				RelativePath=".\player.h">
-			</File>
-			<File
-				RelativePath=".\oldpool.h">
-			</File>
-			<File
-				RelativePath=".\queue.h">
-			</File>
-			<File
-				RelativePath=".\rail.h">
-			</File>
-			<File
-				RelativePath=".\saveload.h">
-			</File>
-			<File
-				RelativePath=".\screenshot.h">
-			</File>
-			<File
-				RelativePath=".\sound\sdl_s.h">
-			</File>
-			<File
-				RelativePath=".\video\sdl_v.h">
-			</File>
-			<File
-				RelativePath=".\settings.h">
-			</File>
-			<File
-				RelativePath=".\signs.h">
-			</File>
-			<File
-				RelativePath=".\slope.h">
-			</File>
-			<File
-				RelativePath=".\sound.h">
-			</File>
-			<File
-				RelativePath=".\sprite.h">
-			</File>
-			<File
-				RelativePath=".\station.h">
-			</File>
-			<File
-				RelativePath=".\StdAfx.h">
-			</File>
-			<File
-				RelativePath=".\string.h">
-			</File>
-			<File
-				RelativePath=".\tgp.h">
-			</File>
-			<File
-				RelativePath=".\thread.h">
-			</File>
-			<File
-				RelativePath=".\tile.h">
-			</File>
-			<File
-				RelativePath=".\town.h">
-			</File>
-			<File
-				RelativePath=".\train.h">
-			</File>
-			<File
-				RelativePath=".\variables.h">
-			</File>
-			<File
-				RelativePath=".\vehicle.h">
-			</File>
-			<File
-				RelativePath=".\vehicle_gui.h">
-			</File>
-			<File
-				RelativePath=".\viewport.h">
-			</File>
-			<File
-				RelativePath=".\waypoint.h">
-			</File>
-			<File
-				RelativePath=".\win32.h">
-			</File>
-			<File
-				RelativePath=".\music\win32_m.h">
-			</File>
-			<File
-				RelativePath=".\sound\win32_s.h">
-			</File>
-			<File
-				RelativePath=".\video\win32_v.h">
-			</File>
-			<File
-				RelativePath=".\window.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Gui Source codes"
-			Filter="">
-			<File
-				RelativePath=".\aircraft_gui.c">
-			</File>
-			<File
-				RelativePath=".\airport_gui.c">
-			</File>
-			<File
-				RelativePath=".\bridge_gui.c">
-			</File>
-			<File
-				RelativePath=".\build_vehicle_gui.c">
-			</File>
-			<File
-				RelativePath=".\depot_gui.c">
-			</File>
-			<File
-				RelativePath=".\dock_gui.c">
-			</File>
-			<File
-				RelativePath=".\engine_gui.c">
-			</File>
-			<File
-				RelativePath=".\genworld_gui.c">
-			</File>
-			<File
-				RelativePath=".\graph_gui.c">
-			</File>
-			<File
-				RelativePath=".\industry_gui.c">
-			</File>
-			<File
-				RelativePath=".\intro_gui.c">
-			</File>
-			<File
-				RelativePath=".\main_gui.c">
-			</File>
-			<File
-				RelativePath=".\misc_gui.c">
-			</File>
-			<File
-				RelativePath=".\music_gui.c">
-			</File>
-			<File
-				RelativePath=".\network_gui.c">
-			</File>
-			<File
-				RelativePath=".\newgrf_gui.c">
-			</File>
-			<File
-				RelativePath=".\news_gui.c">
-			</File>
-			<File
-				RelativePath=".\order_gui.c">
-			</File>
-			<File
-				RelativePath=".\player_gui.c">
-			</File>
-			<File
-				RelativePath=".\rail_gui.c">
-			</File>
-			<File
-				RelativePath=".\road_gui.c">
-			</File>
-			<File
-				RelativePath=".\roadveh_gui.c">
-			</File>
-			<File
-				RelativePath=".\settings_gui.c">
-			</File>
-			<File
-				RelativePath=".\ship_gui.c">
-			</File>
-			<File
-				RelativePath=".\smallmap_gui.c">
-			</File>
-			<File
-				RelativePath=".\station_gui.c">
-			</File>
-			<File
-				RelativePath=".\subsidy_gui.c">
-			</File>
-			<File
-				RelativePath=".\terraform_gui.c">
-			</File>
-			<File
-				RelativePath=".\town_gui.c">
-			</File>
-			<File
-				RelativePath=".\train_gui.c">
-			</File>
-			<File
-				RelativePath=".\vehicle_gui.c">
-			</File>
-		</Filter>
-		<Filter
-			Name="Landscape"
-			Filter="">
-			<File
-				RelativePath=".\aircraft_cmd.c">
-			</File>
-			<File
-				RelativePath=".\clear_cmd.c">
-			</File>
-			<File
-				RelativePath=".\disaster_cmd.c">
-			</File>
-			<File
-				RelativePath=".\dummy_land.c">
-			</File>
-			<File
-				RelativePath=".\industry_cmd.c">
-			</File>
-			<File
-				RelativePath=".\misc_cmd.c">
-			</File>
-			<File
-				RelativePath=".\order_cmd.c">
-			</File>
-			<File
-				RelativePath=".\rail_cmd.c">
-			</File>
-			<File
-				RelativePath=".\road_cmd.c">
-			</File>
-			<File
-				RelativePath=".\roadveh_cmd.c">
-			</File>
-			<File
-				RelativePath=".\ship_cmd.c">
-			</File>
-			<File
-				RelativePath=".\station_cmd.c">
-			</File>
-			<File
-				RelativePath=".\town_cmd.c">
-			</File>
-			<File
-				RelativePath=".\train_cmd.c">
-			</File>
-			<File
-				RelativePath=".\tree_cmd.c">
-			</File>
-			<File
-				RelativePath=".\tunnelbridge_cmd.c">
-			</File>
-			<File
-				RelativePath=".\unmovable_cmd.c">
-			</File>
-			<File
-				RelativePath=".\water_cmd.c">
-			</File>
-		</Filter>
-		<Filter
-			Name="Tables"
-			Filter="">
-			<File
-				RelativePath=".\table\ai_rail.h">
-			</File>
-			<File
-				RelativePath=".\table\allstrings.h">
-			</File>
-			<File
-				RelativePath=".\table\animcursors.h">
-			</File>
-			<File
-				RelativePath=".\table\autorail.h">
-			</File>
-			<File
-				RelativePath=".\table\build_industry.h">
-			</File>
-			<File
-				RelativePath=".\table\clear_land.h">
-			</File>
-			<File
-				RelativePath=".\table\control_codes.h">
-			</File>
-			<File
-				RelativePath=".\table\elrail_data.h">
-			</File>
-			<File
-				RelativePath=".\table\engines.h">
-			</File>
-			<File
-				RelativePath=".\table\files.h">
-			</File>
-			<File
-				RelativePath=".\table\genland.h">
-			</File>
-			<File
-				RelativePath=".\table\industry_land.h">
-			</File>
-			<File
-				RelativePath=".\table\landscape_const.h">
-			</File>
-			<File
-				RelativePath=".\table\landscape_sprite.h">
-			</File>
-			<File
-				RelativePath=".\table\namegen.h">
-			</File>
-			<File
-				RelativePath=".\table\palettes.h">
-			</File>
-			<File
-				RelativePath=".\table\road_land.h">
-			</File>
-			<File
-				RelativePath=".\table\roadveh.h">
-			</File>
-			<File
-				RelativePath=".\table\sprites.h">
-			</File>
-			<File
-				RelativePath=".\table\station_land.h">
-			</File>
-			<File
-				RelativePath=".\table\strings.h">
-			</File>
-			<File
-				RelativePath=".\table\town_land.h">
-			</File>
-			<File
-				RelativePath=".\table\track_land.h">
-			</File>
-			<File
-				RelativePath=".\table\train_cmd.h">
-			</File>
-			<File
-				RelativePath=".\table\tree_land.h">
-			</File>
-			<File
-				RelativePath=".\table\tunnel_land.h">
-			</File>
-			<File
-				RelativePath=".\table\unicode.h">
-			</File>
-			<File
-				RelativePath=".\table\unmovable_land.h">
-			</File>
-			<File
-				RelativePath=".\table\water_land.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="AI Files"
-			Filter="">
-			<File
-				RelativePath=".\ai\ai.c">
-			</File>
-			<File
-				RelativePath=".\ai\ai.h">
-			</File>
-			<File
-				RelativePath=".\ai\default\default.c">
-			</File>
-			<File
-				RelativePath=".\ai\default\default.h">
-			</File>
-			<Filter
-				Name="trolly"
-				Filter="">
-				<File
-					RelativePath=".\ai\trolly\build.c">
-				</File>
-				<File
-					RelativePath=".\ai\trolly\pathfinder.c">
-				</File>
-				<File
-					RelativePath=".\ai\trolly\shared.c">
-				</File>
-				<File
-					RelativePath=".\ai\trolly\trolly.c">
-				</File>
-				<File
-					RelativePath=".\ai\trolly\trolly.h">
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Map Accessors"
-			Filter="">
-			<File
-				RelativePath=".\bridge_map.c">
-			</File>
-			<File
-				RelativePath=".\bridge_map.h">
-			</File>
-			<File
-				RelativePath=".\clear_map.h">
-			</File>
-			<File
-				RelativePath=".\industry_map.h">
-			</File>
-			<File
-				RelativePath=".\rail_map.h">
-			</File>
-			<File
-				RelativePath=".\road_map.c">
-			</File>
-			<File
-				RelativePath=".\road_map.h">
-			</File>
-			<File
-				RelativePath=".\station_map.c">
-			</File>
-			<File
-				RelativePath=".\station_map.h">
-			</File>
-			<File
-				RelativePath=".\town_map.h">
-			</File>
-			<File
-				RelativePath=".\tree_map.h">
-			</File>
-			<File
-				RelativePath=".\tunnel_map.c">
-			</File>
-			<File
-				RelativePath=".\tunnel_map.h">
-			</File>
-			<File
-				RelativePath=".\unmovable_map.h">
-			</File>
-			<File
-				RelativePath=".\void_map.h">
-			</File>
-			<File
-				RelativePath=".\water_map.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="yapf"
-			Filter="">
-			<File
-				RelativePath=".\yapf\array.hpp">
-			</File>
-			<File
-				RelativePath=".\yapf\autocopyptr.hpp">
-			</File>
-			<File
-				RelativePath=".\yapf\binaryheap.hpp">
-			</File>
-			<File
-				RelativePath=".\yapf\blob.hpp">
-			</File>
-			<File
-				RelativePath=".\yapf\countedptr.hpp">
-			</File>
-			<File
-				RelativePath=".\yapf\crc32.hpp">
-			</File>
-			<File
-				RelativePath=".\yapf\fixedsizearray.hpp">
-			</File>
-			<File
-				RelativePath=".\yapf\follow_track.cpp">
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="2"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="2"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\yapf\follow_track.hpp">
-			</File>
-			<File
-				RelativePath=".\yapf\hashtable.hpp">
-			</File>
-			<File
-				RelativePath=".\yapf\nodelist.hpp">
-			</File>
-			<File
-				RelativePath=".\yapf\track_dir.hpp">
-			</File>
-			<File
-				RelativePath=".\yapf\yapf.h">
-			</File>
-			<File
-				RelativePath=".\yapf\yapf.hpp">
-			</File>
-			<File
-				RelativePath=".\yapf\yapf_base.hpp">
-			</File>
-			<File
-				RelativePath=".\yapf\yapf_common.cpp">
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="2"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="2"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\yapf\yapf_common.hpp">
-			</File>
-			<File
-				RelativePath=".\yapf\yapf_costbase.hpp">
-			</File>
-			<File
-				RelativePath=".\yapf\yapf_costcache.hpp">
-			</File>
-			<File
-				RelativePath=".\yapf\yapf_costrail.hpp">
-			</File>
-			<File
-				RelativePath=".\yapf\yapf_destrail.hpp">
-			</File>
-			<File
-				RelativePath=".\yapf\yapf_node.hpp">
-			</File>
-			<File
-				RelativePath=".\yapf\yapf_node_rail.hpp">
-			</File>
-			<File
-				RelativePath=".\yapf\yapf_node_road.hpp">
-			</File>
-			<File
-				RelativePath=".\yapf\yapf_rail.cpp">
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="2"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="2"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\yapf\yapf_road.cpp">
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="2"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="2"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\yapf\yapf_settings.h">
-			</File>
-			<File
-				RelativePath=".\yapf\yapf_ship.cpp">
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="2"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="2"/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<File
-			RelativePath=".\mainicon.ico">
-		</File>
-		<File
-			RelativePath=".\openttd.ico">
-		</File>
-		<File
-			RelativePath=".\ReadMe.txt">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>