Mercurial > hg > openttd

changeset 4029:d16723b0f61a draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r5286) - Clean up VS2005 project files by making them identical to the VS2003 project file. Mainly put object files into a subdirectory of the project directory instead of a level higher which makes absolutely no sense. Also add some ignores, remove obsolete VS6 project files.
author Darkvater <Darkvater@openttd.org>
date Fri, 16 Jun 2006 00:28:15 +0000
parents 55efe3804291
children d2970d47a816
files openttd.dsp openttd.dsw openttd_vs80.sln openttd_vs80.vcproj strgen/strgen_vs80.vcproj yapf/unittest/unittest_vs80.vcproj
diffstat 6 files changed, 85 insertions(+), 1604 deletions(-) [+]
line wrap: on
line diff
deleted file mode 100644
--- a/openttd.dsp
+++ /dev/null
@@ -1,1414 +0,0 @@
-# Microsoft Developer Studio Project File - Name="openttd" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=openttd - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "openttd.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "openttd.mak" CFG="openttd - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "openttd - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "openttd - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "openttd - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /Gr /Zp4 /MT /W3 /Zi /Ox /Oa /Ow /Og /Oi /Os /Gf /Gy /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "WIN32_EXCEPTION_TRACKER" /D "WIN32_ENABLE_DIRECTMUSIC_SUPPORT" /D "WITH_PNG" /D "WITH_ZLIB" /D "ENABLE_NETWORK" /FAcs /FR /YX"stdafx.h" /J /FD /c
-# SUBTRACT CPP /WX /Ot
-# ADD BASE RSC /l 0x809 /d "NDEBUG"
-# ADD RSC /l 0x809 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib /nologo /subsystem:windows /map /machine:I386 /nodefaultlib:"LIBC.lib" /libpath:"../lib" /opt:nowin98
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF  "$(CFG)" == "openttd - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /ZI /Od /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "WITH_PNG" /D "WITH_ZLIB" /D "ENABLE_NETWORK" /D "WIN32_ENABLE_DIRECTMUSIC_SUPPORT" /YX"stdafx.h" /FD /GZ /c
-# SUBTRACT CPP /WX /Fr
-# ADD BASE RSC /l 0x809 /d "_DEBUG"
-# ADD RSC /l 0x809 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"LIBC.lib" /pdbtype:sept /libpath:"../lib"
-# SUBTRACT LINK32 /pdb:none
-
-!ENDIF 
-
-# Begin Target
-
-# Name "openttd - Win32 Release"
-# Name "openttd - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\ai\ai.c
-
-!IF  "$(CFG)" == "openttd - Win32 Release"
-
-# ADD CPP /YX
-
-!ELSEIF  "$(CFG)" == "openttd - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\airport.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\aystar.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ai\trolly\build.c
-
-!IF  "$(CFG)" == "openttd - Win32 Release"
-
-# ADD CPP /YX
-
-!ELSEIF  "$(CFG)" == "openttd - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\command.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\console.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\console_cmds.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\currency.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\debug.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\video\dedicated_v.c
-
-!IF  "$(CFG)" == "openttd - Win32 Release"
-
-# ADD CPP /YX
-
-!ELSEIF  "$(CFG)" == "openttd - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\ai\default\default.c
-
-!IF  "$(CFG)" == "openttd - Win32 Release"
-
-# ADD CPP /YX
-
-!ELSEIF  "$(CFG)" == "openttd - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\depot.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\music\dmusic.cpp
-
-!IF  "$(CFG)" == "openttd - Win32 Release"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "openttd - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\documentation.txt
-# End Source File
-# Begin Source File
-
-SOURCE=.\driver.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\economy.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\elrail.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\engine.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\fileio.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\gfx.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\gfxinit.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\landscape.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\map.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\md5.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\mersenne.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\minilzo.c
-
-!IF  "$(CFG)" == "openttd - Win32 Release"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "openttd - Win32 Debug"
-
-# SUBTRACT CPP /YX
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\misc.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\mixer.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\namegen.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\network.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\newgrf.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\newgrf_cargo.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\newgrf_engine.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\newgrf_spritegroup.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\newgrf_station.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\newgrf_text.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\npf.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\music\null_m.c
-
-!IF  "$(CFG)" == "openttd - Win32 Release"
-
-# ADD CPP /YX
-
-!ELSEIF  "$(CFG)" == "openttd - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\sound\null_s.c
-
-!IF  "$(CFG)" == "openttd - Win32 Release"
-
-# ADD CPP /YX
-
-!ELSEIF  "$(CFG)" == "openttd - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\video\null_v.c
-
-!IF  "$(CFG)" == "openttd - Win32 Release"
-
-# ADD CPP /YX
-
-!ELSEIF  "$(CFG)" == "openttd - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\oldloader.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\openttd.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\os_timer.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ottdres.rc
-# End Source File
-# Begin Source File
-
-SOURCE=.\pathfind.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ai\trolly\pathfinder.c
-
-!IF  "$(CFG)" == "openttd - Win32 Release"
-
-# ADD CPP /YX
-
-!ELSEIF  "$(CFG)" == "openttd - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\players.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\pool.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\queue.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\rail.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\saveload.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\screenshot.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\sdl.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\sound\sdl_s.c
-
-!IF  "$(CFG)" == "openttd - Win32 Release"
-
-# ADD CPP /YX
-
-!ELSEIF  "$(CFG)" == "openttd - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\video\sdl_v.c
-
-!IF  "$(CFG)" == "openttd - Win32 Release"
-
-# ADD CPP /YX
-
-!ELSEIF  "$(CFG)" == "openttd - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\settings.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ai\trolly\shared.c
-
-!IF  "$(CFG)" == "openttd - Win32 Release"
-
-# ADD CPP /YX
-
-!ELSEIF  "$(CFG)" == "openttd - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\signs.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\sound.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\spritecache.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\StdAfx.c
-
-!IF  "$(CFG)" == "openttd - Win32 Release"
-
-# ADD CPP /Yc"stdafx.h"
-
-!ELSEIF  "$(CFG)" == "openttd - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\string.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\strings.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\texteff.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\thread.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\tile.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ai\trolly\trolly.c
-
-!IF  "$(CFG)" == "openttd - Win32 Release"
-
-# ADD CPP /YX
-
-!ELSEIF  "$(CFG)" == "openttd - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\unix.c
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
-SOURCE=.\vehicle.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\vehicle_gui.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\viewport.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\waypoint.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\widget.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\win32.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\music\win32_m.c
-
-!IF  "$(CFG)" == "openttd - Win32 Release"
-
-# ADD CPP /YX
-
-!ELSEIF  "$(CFG)" == "openttd - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\sound\win32_s.c
-
-!IF  "$(CFG)" == "openttd - Win32 Release"
-
-# ADD CPP /YX
-
-!ELSEIF  "$(CFG)" == "openttd - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\video\win32_v.c
-
-!IF  "$(CFG)" == "openttd - Win32 Release"
-
-# ADD CPP /YX
-
-!ELSEIF  "$(CFG)" == "openttd - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\window.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\yapf\yapf_rail.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\ai\ai.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\aystar.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\clear.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\command.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\console.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\currency.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\debug.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\video\dedicated_v.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\depot.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\music\dmusic.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\driver.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\economy.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\engine.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\fileio.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\functions.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\gfx.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\gfxinit.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\gui.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\hal.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\industry.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\macros.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\map.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\md5.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\network.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\newgrf.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\newgrf_callbacks.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\newgrf_cargo.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\newgrf_engine.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\newgrf_spritegroup.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\newgrf_station.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\newgrf_text.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\news.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\npf.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\music\null_m.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sound\null_s.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\video\null_v.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\openttd.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\pathfind.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\player.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\pool.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\queue.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\rail.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\road.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\saveload.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sound\sdl_s.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\video\sdl_v.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\signs.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\slope.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sound.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\station.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\StdAfx.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\string.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\strings.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\thread.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\tile.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\town.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\train.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ai\trolly\trolly.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\variables.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\vehicle.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\vehicle_gui.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\viewport.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\void.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\waypoint.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\music\win32_m.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sound\win32_s.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\video\win32_v.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\window.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\yapf\yapf_node_rail.hpp
-# End Source File
-# End Group
-# Begin Group "Gui Source codes"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\aircraft_gui.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\airport_gui.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\bridge_gui.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\dock_gui.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\engine_gui.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\graph_gui.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\industry_gui.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\intro_gui.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\main_gui.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\misc_gui.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\music_gui.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\network_gui.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\news_gui.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\order_gui.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\player_gui.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\rail_gui.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\road_gui.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\roadveh_gui.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\settings_gui.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ship_gui.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\smallmap_gui.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\station_gui.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\subsidy_gui.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\terraform_gui.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\town_gui.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\train_gui.c
-# End Source File
-# End Group
-# Begin Group "Landscape"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\aircraft_cmd.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\clear_cmd.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\disaster_cmd.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\dummy_land.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\industry_cmd.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\misc_cmd.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\order_cmd.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\rail_cmd.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\road_cmd.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\roadveh_cmd.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ship_cmd.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\station_cmd.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\town_cmd.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\train_cmd.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\tree_cmd.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\tunnelbridge_cmd.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\unmovable_cmd.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\water_cmd.c
-# End Source File
-# End Group
-# Begin Group "Tables"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\table\ai_rail.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\table\allstrings.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\table\animcursors.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\table\autorail.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\table\build_industry.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\table\clear_land.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\table\elrail_data.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\table\engines.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\table\files.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\table\genland.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\table\industry_land.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\table\landscape_const.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\table\landscape_sprite.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\table\namegen.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\table\palettes.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\table\road_land.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\table\roadveh.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\table\sprites.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\table\station_land.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\table\strings.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\table\town_land.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\table\track_land.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\table\train_cmd.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\table\tree_land.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\table\tunnel_land.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\table\unmovable_land.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\table\water_land.h
-# End Source File
-# End Group
-# Begin Group "Network Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\callback_table.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\dedicated.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\network_client.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\network_data.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\network_gamelist.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\network_server.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\network_udp.c
-# End Source File
-# End Group
-# Begin Group "Network Header Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\network_client.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\network_core.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\network_data.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\network_gamelist.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\network_server.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\network_udp.h
-# End Source File
-# End Group
-# Begin Group "Map Accessors"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\bridge_map.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\bridge_map.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\clear_map.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\industry_map.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\rail_map.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\road_map.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\road_map.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\station_map.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\station_map.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\town_map.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\tree_map.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\tunnel_map.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\tunnel_map.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\unmovable_map.h
-# End Source File
-# End Group
-# Begin Group "yapf"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\yapf\array.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\yapf\autocopyptr.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\yapf\binaryheap.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\yapf\blob.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\yapf\countedptr.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\yapf\fixedsizearray.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\yapf\follow_track.cpp
-
-!IF  "$(CFG)" == "openttd - Win32 Release"
-
-# ADD CPP /YX
-
-!ELSEIF  "$(CFG)" == "openttd - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\yapf\follow_track.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\yapf\hashtable.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\yapf\nodelist.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\yapf\track_dir.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\yapf\yapf.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\yapf\yapf.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\yapf\yapf_base.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\yapf\yapf_common.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\yapf\yapf_common.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\yapf\yapf_costbase.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\yapf\yapf_costcache.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\yapf\yapf_costrail.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\yapf\yapf_destrail.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\yapf\yapf_node.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\yapf\yapf_node_road.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\yapf\yapf_road.cpp
-
-!IF  "$(CFG)" == "openttd - Win32 Release"
-
-# ADD CPP /YX
-
-!ELSEIF  "$(CFG)" == "openttd - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\yapf\yapf_ship.cpp
-
-!IF  "$(CFG)" == "openttd - Win32 Release"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "openttd - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=.\changelog.txt
-# End Source File
-# Begin Source File
-
-SOURCE=.\mainicon.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\openttd.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\ReadMe.txt
-# End Source File
-# End Target
-# End Project
deleted file mode 100644
--- a/openttd.dsw
+++ /dev/null
@@ -1,71 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "langs"=.\langs.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name strgen
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "openttd"=.\openttd.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name langs
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "strgen"=.\strgen\strgen.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "unittest"=.\yapf\unittest\unittest.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
--- a/openttd_vs80.sln
+++ b/openttd_vs80.sln
@@ -1,72 +1,47 @@
-
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "strgen", "strgen\strgen_vs80.vcproj", "{DFCBA918-FCBD-43E1-B9E6-517EA39F9042}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "strgen", "strgen\strgen_vs80.vcproj", "{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openttd", "openttd_vs80.vcproj", "{668328A0-B40E-4CDB-BD72-D0064424414A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{0F066B23-18DF-4284-8265-F4A5E7E3B966} = {0F066B23-18DF-4284-8265-F4A5E7E3B966}
+		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1} = {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "langs", "langs_vs80.vcproj", "{0F066B23-18DF-4284-8265-F4A5E7E3B966}"
 	ProjectSection(ProjectDependencies) = postProject
-		{DFCBA918-FCBD-43E1-B9E6-517EA39F9042} = {DFCBA918-FCBD-43E1-B9E6-517EA39F9042}
+		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1} = {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openttd", "openttd_vs80.vcproj", "{A7741714-F259-48CB-94D4-1F75BA88E907}"
-	ProjectSection(ProjectDependencies) = postProject
-		{0F066B23-18DF-4284-8265-F4A5E7E3B966} = {0F066B23-18DF-4284-8265-F4A5E7E3B966}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unittest", "yapf\unittest\unittest_vs80.vcproj", "{01F91A15-3DA0-4FD1-981D-38F935BDD8FE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unittest", "yapf\unittest\unittest_vs80.vcproj", "{4AECBDC3-D57E-4AFB-90BD-DDF10707588C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|Mixed Platforms = Debug|Mixed Platforms
 		Debug|Win32 = Debug|Win32
-		Release|Any CPU = Release|Any CPU
-		Release|Mixed Platforms = Release|Mixed Platforms
 		Release|Win32 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{DFCBA918-FCBD-43E1-B9E6-517EA39F9042}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{DFCBA918-FCBD-43E1-B9E6-517EA39F9042}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{DFCBA918-FCBD-43E1-B9E6-517EA39F9042}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{DFCBA918-FCBD-43E1-B9E6-517EA39F9042}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DFCBA918-FCBD-43E1-B9E6-517EA39F9042}.Debug|Win32.Build.0 = Debug|Win32
-		{DFCBA918-FCBD-43E1-B9E6-517EA39F9042}.Release|Any CPU.ActiveCfg = Debug|Win32
-		{DFCBA918-FCBD-43E1-B9E6-517EA39F9042}.Release|Mixed Platforms.ActiveCfg = Debug|Win32
-		{DFCBA918-FCBD-43E1-B9E6-517EA39F9042}.Release|Mixed Platforms.Build.0 = Debug|Win32
-		{DFCBA918-FCBD-43E1-B9E6-517EA39F9042}.Release|Win32.ActiveCfg = Debug|Win32
-		{DFCBA918-FCBD-43E1-B9E6-517EA39F9042}.Release|Win32.Build.0 = Debug|Win32
-		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug|Win32.Build.0 = Debug|Win32
+		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release|Win32.ActiveCfg = Debug|Win32
+		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release|Win32.Build.0 = Debug|Win32
+		{668328A0-B40E-4CDB-BD72-D0064424414A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{668328A0-B40E-4CDB-BD72-D0064424414A}.Debug|Win32.Build.0 = Debug|Win32
+		{668328A0-B40E-4CDB-BD72-D0064424414A}.Release|Win32.ActiveCfg = Release|Win32
+		{668328A0-B40E-4CDB-BD72-D0064424414A}.Release|Win32.Build.0 = Release|Win32
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Debug|Win32.ActiveCfg = Debug|Win32
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Debug|Win32.Build.0 = Debug|Win32
-		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release|Any CPU.ActiveCfg = Debug|Win32
-		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release|Mixed Platforms.ActiveCfg = Debug|Win32
-		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release|Mixed Platforms.Build.0 = Debug|Win32
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release|Win32.ActiveCfg = Debug|Win32
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release|Win32.Build.0 = Debug|Win32
-		{A7741714-F259-48CB-94D4-1F75BA88E907}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{A7741714-F259-48CB-94D4-1F75BA88E907}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{A7741714-F259-48CB-94D4-1F75BA88E907}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{A7741714-F259-48CB-94D4-1F75BA88E907}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A7741714-F259-48CB-94D4-1F75BA88E907}.Debug|Win32.Build.0 = Debug|Win32
-		{A7741714-F259-48CB-94D4-1F75BA88E907}.Release|Any CPU.ActiveCfg = Release|Win32
-		{A7741714-F259-48CB-94D4-1F75BA88E907}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{A7741714-F259-48CB-94D4-1F75BA88E907}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{A7741714-F259-48CB-94D4-1F75BA88E907}.Release|Win32.ActiveCfg = Release|Win32
-		{A7741714-F259-48CB-94D4-1F75BA88E907}.Release|Win32.Build.0 = Release|Win32
-		{01F91A15-3DA0-4FD1-981D-38F935BDD8FE}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{01F91A15-3DA0-4FD1-981D-38F935BDD8FE}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{01F91A15-3DA0-4FD1-981D-38F935BDD8FE}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{01F91A15-3DA0-4FD1-981D-38F935BDD8FE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{01F91A15-3DA0-4FD1-981D-38F935BDD8FE}.Debug|Win32.Build.0 = Debug|Win32
-		{01F91A15-3DA0-4FD1-981D-38F935BDD8FE}.Release|Any CPU.ActiveCfg = Release|Win32
-		{01F91A15-3DA0-4FD1-981D-38F935BDD8FE}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{01F91A15-3DA0-4FD1-981D-38F935BDD8FE}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{01F91A15-3DA0-4FD1-981D-38F935BDD8FE}.Release|Win32.ActiveCfg = Release|Win32
-		{01F91A15-3DA0-4FD1-981D-38F935BDD8FE}.Release|Win32.Build.0 = Release|Win32
+		{4AECBDC3-D57E-4AFB-90BD-DDF10707588C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4AECBDC3-D57E-4AFB-90BD-DDF10707588C}.Debug|Win32.Build.0 = Debug|Win32
+		{4AECBDC3-D57E-4AFB-90BD-DDF10707588C}.Release|Win32.ActiveCfg = Release|Win32
+		{4AECBDC3-D57E-4AFB-90BD-DDF10707588C}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(DPCodeReviewSolutionGUID) = preSolution
+		DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
+	EndGlobalSection
 EndGlobal
--- a/openttd_vs80.vcproj
+++ b/openttd_vs80.vcproj
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="openttd"
-	ProjectGUID="{A7741714-F259-48CB-94D4-1F75BA88E907}"
+	ProjectGUID="{668328A0-B40E-4CDB-BD72-D0064424414A}"
 	RootNamespace="openttd"
 	>
 	<Platforms>
@@ -16,8 +16,8 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="..\Release"
-			IntermediateDirectory="..\Release"
+			OutputDirectory=".\$(ConfigurationName)\"
+			IntermediateDirectory=".\$(ConfigurationName)\"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -44,15 +44,14 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
+				Optimization="3"
+				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
+				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="$(SolutionDir)../include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;ENABLE_NETWORK"
 				StringPooling="true"
-				ExceptionHandling="2"
+				ExceptionHandling="1"
 				RuntimeLibrary="0"
 				StructMemberAlignment="3"
 				BufferSecurityCheck="false"
@@ -62,9 +61,9 @@
 				PrecompiledHeaderThrough=""
 				PrecompiledHeaderFile=""
 				AssemblerOutput="2"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
+				AssemblerListingLocation=".\$(ConfigurationName)\"
+				ObjectFile=".\$(ConfigurationName)\"
+				ProgramDataBaseFileName=".\$(ConfigurationName)\"
 				BrowseInformation="1"
 				WarningLevel="3"
 				WarnAsError="true"
@@ -87,15 +86,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib"
-				OutputFile="..\Release/openttd.exe"
+				OutputFile=".\$(ConfigurationName)\openttd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(SolutionDir)../lib"
+				IgnoreDefaultLibraryNames="LIBC.lib"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\Release/openttd.pdb"
-				GenerateMapFile="true"
-				MapFileName=".\Release/openttd.map"
-				MapExports="true"
+				ProgramDatabaseFile=".\$(ConfigurationName)\openttd.pdb"
 				SubSystem="2"
 				OptimizeReferences="2"
 				OptimizeForWindows98="1"
@@ -128,8 +124,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="..\Debug"
-			IntermediateDirectory="..\Debug"
+			OutputDirectory=".\$(ConfigurationName)\"
+			IntermediateDirectory=".\$(ConfigurationName)\"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -156,16 +152,15 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)../include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;__WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;ENABLE_NETWORK"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;ENABLE_NETWORK"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
-				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile="..\Debug/openttd.pch"
-				AssemblerListingLocation="..\Debug/"
-				ObjectFile="..\Debug/"
-				ProgramDataBaseFileName="..\Debug/"
+				PrecompiledHeaderThrough=""
+				PrecompiledHeaderFile=""
+				AssemblerListingLocation=".\$(ConfigurationName)\"
+				ObjectFile=".\$(ConfigurationName)\"
+				ProgramDataBaseFileName=".\$(ConfigurationName)\"
 				WarningLevel="3"
 				WarnAsError="true"
 				SuppressStartupBanner="true"
@@ -188,12 +183,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib"
-				OutputFile="..\Debug/openttd.exe"
+				OutputFile=".\$(ConfigurationName)\openttd.exe"
 				LinkIncremental="0"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(SolutionDir)../lib"
+				IgnoreDefaultLibraryNames="LIBC.lib"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\Debug/openttd.pdb"
+				ProgramDatabaseFile=".\$(ConfigurationName)\openttd.pdb"
 				SubSystem="2"
 				TargetMachine="1"
 			/>
@@ -930,14 +925,6 @@
 			<File
 				RelativePath=".\player_gui.c"
 				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ShowIncludes="false"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\rail_gui.c"
@@ -1092,6 +1079,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\table\elrail_data.h"
+				>
+			</File>
+			<File
 				RelativePath=".\table\engines.h"
 				>
 			</File>
@@ -1213,7 +1204,7 @@
 			</Filter>
 		</Filter>
 		<Filter
-			Name="map"
+			Name="Map Accessors"
 			>
 			<File
 				RelativePath=".\bridge_map.c"
--- a/strgen/strgen_vs80.vcproj
+++ b/strgen/strgen_vs80.vcproj
@@ -3,8 +3,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="strgen"
-	ProjectGUID="{DFCBA918-FCBD-43E1-B9E6-517EA39F9042}"
-	RootNamespace="strgen_vs80"
+	ProjectGUID="{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}"
 	>
 	<Platforms>
 		<Platform
@@ -16,8 +15,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="..\..\Debug"
-			IntermediateDirectory="..\..\Debug"
+			OutputDirectory=".\Debug"
+			IntermediateDirectory=".\Debug"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -47,10 +46,10 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				PrecompiledHeaderFile="..\..\Debug/strgen.pch"
-				AssemblerListingLocation="..\..\Debug/"
-				ObjectFile="..\..\Debug/"
-				ProgramDataBaseFileName="..\..\Debug/"
+				PrecompiledHeaderFile=".\Debug/strgen.pch"
+				AssemblerListingLocation=".\Debug/"
+				ObjectFile=".\Debug/"
+				ProgramDataBaseFileName=".\Debug/"
 				WarningLevel="3"
 				WarnAsError="true"
 				SuppressStartupBanner="true"
@@ -69,11 +68,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="Debug/strgen.exe"
+				OutputFile=".\Debug/strgen.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\Debug/strgen.pdb"
+				ProgramDatabaseFile=".\Debug/strgen.pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>
--- a/yapf/unittest/unittest_vs80.vcproj
+++ b/yapf/unittest/unittest_vs80.vcproj
@@ -3,8 +3,8 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="unittest"
-	ProjectGUID="{01F91A15-3DA0-4FD1-981D-38F935BDD8FE}"
-	RootNamespace="test_bh"
+	ProjectGUID="{4AECBDC3-D57E-4AFB-90BD-DDF10707588C}"
+	RootNamespace="unittest"
 	Keyword="Win32Proj"
 	>
 	<Platforms>
@@ -17,10 +17,11 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)../$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)../$(ConfigurationName)"
+			OutputDirectory=".\$(ConfigurationName)\"
+			IntermediateDirectory=".\$(ConfigurationName)\"
 			ConfigurationType="1"
-			CharacterSet="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -40,15 +41,14 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				InlineFunctionExpansion="0"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="3"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
+				DebugInformationFormat="4"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -61,9 +61,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(SolutionDir)../bin/$(ProjectName).exe"
+				OutputFile="$(OutDir)/unittest.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/unittest.pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>
@@ -94,11 +95,11 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)../$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)../$(ConfigurationName)"
+			OutputDirectory=".\$(ConfigurationName)\"
+			IntermediateDirectory=".\$(ConfigurationName)\"
 			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -117,12 +118,8 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="2"
+				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
@@ -139,7 +136,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(SolutionDir)../bin/$(ProjectName).exe"
+				OutputFile="$(OutDir)/unittest.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="1"
@@ -178,7 +175,7 @@
 	<Files>
 		<Filter
 			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
@@ -222,7 +219,7 @@
 		</Filter>
 		<Filter
 			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 		</Filter>
@@ -265,6 +262,10 @@
 				RelativePath="..\track_dir.hpp"
 				>
 			</File>
+			<File
+				RelativePath="..\yapfbase.hpp"
+				>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>