(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.

448 files changed, 8143 insertions, 6120 deletions

diff --git a/Makefile b/Makefile
deleted file mode 100644
index 13be2ab56..000000000
--- a/Makefile
+++ /dev/null
@@ -1,1132 +0,0 @@
-# $Id$
-
-##############################################################################
-#
-# Usage
-#
-
-# Synopsis:
-#
-# make WITH_ZLIB=1 UNIX=1 MANUAL_CONFIG=1
-#
-# (See below for the list of possible options.)
-#
-# Alternately, you can run make without the MANUAL_CONFIG part. It then
-# generates Makefile.config, where you can customize all the options.
-# However beware that for all subsequent calls the option values from
-# Makefile.config take precedence to the commandline options.
-#
-# (That means that you probably want to either specify the options on command
-# line together with MANUAL_CONFIG=1 or you want to specify no commandline
-# options at all.)
-
-# Targets:
-#
-# Defaults to building binary
-# clean: remove intermediate build files
-# mrproper: remove intermediate files and makefile configuration
-# upgradeconf: add new options to old Makefile.config
-# osx: OS X application
-# release: used by OSX to make a dmg file ready to release
-
-# Options:
-#
-# Summary of OS choice defines
-# WIN32: building on Windows
-# UNIX: building on *nix derivate (Linux, FreeBSD)
-# OSX: building on Mac OS X
-# MORPHOS: building on MorphOS
-# BEOS: building on BeOS
-# SUNOS: building on SunOS (Solaris)
-#
-# Summary of library choice defines
-# WITH_ZLIB: savegames using zlib
-# WITH_PNG: screenshots using PNG
-# WITH_SDL: SDL video driver support
-# WITH_COCOA: Cocoa video driver support
-#
-# Summary of other defines:
-# DEBUG: build in debug mode
-# PROFILE: build in profile mode, disables -s and -fomit-frame-pointer
-# TRANSLATOR: build in translator mode (untranslated strings are prepended by
-#             a <TODO> mark)
-# RELEASE: this will be the released version number. It replaces all places
-#          where it normally would print the revision number
-# MIDI: if set, it will use it as custom path to midi player.
-#       If unset, it will use the hardcoded path in the c code
-#       This can still be overriden by the music.extmidi openttd.cfg option.
-# WITH_DIRECTMUSIC: enable DirectMusic MIDI support
-# WITH_NETWORK: enable networking
-# DEDICATED: allows compilation on UNIX without SDL. Useful for dedicated servers
-#
-# Paths:
-# INSTALL: If not set, the game uses the directory of the binary to
-# store everything (lang, data, gm, save and openttd.cfg), this is the `old' behaviour.
-# In this case, none of the following paths are used, you also should _not_
-# use `make install', but copy the required stuff yourself (or just play out
-# of you source directory, which should work fine).
-# If you want to use `make install' to install the game globally, you should
-# define it _before_ you build the game. If you only define INSTALL when you
-# do `make install', the game won't be able to find it's files (so you should
-# also define all the following paths before building).
-#
-# So, the following paths should be defined if INSTALL is defined.
-# None of these paths have to end with /
-# PREFIX:	Normally /usr/local
-# BINARY_DIR:	The location of the binary, normally games. (Will be prefixed
-#		with $PREFIX)
-# DATA_DIR: 	The location of the data (lang, data, gm and scenario), normally
-#		share/games/openttd. (Will be prefixed with $PREFIX) Note that scenarios
-#		are only put here if USE_HOMEDIR is true, otherwise they are placed in
-#		PERSONAL_DIR/scenario
-# ICON_DIR:   The location of the openttd icon. (Will be prefixed with
-# 	$PREFIX).
-# PERSONAL_DIR:	The directory where openttd.cfg and the save folder will be
-#		stored. You cannot use ~ here, define USE_HOMEDIR for that.
-# USE_HOMEDIR:	If this variable is set, PERSONAL_DIR will be prefixed with
-#		~/ at runtime (the user's homedir)
-# SECOND_DATA_PATH  Use this data dir if a file is not found in the data dir in the data path
-# CUSTOM_LANG_PATH  If this is set, it will use the path given to search for lng files
-#		instead of the lang dir in the data path
-#   NOTE: both SECOND_DATA_PATH and CUSTOM_LANG_PATH uses paths relative to where OTTD is opened
-#
-# DEST_DIR:	make install will use this directory instead of the filesystem
-# 		root to install its files. This should normally not be used by
-# 		ordinary users, currently it is only used for the debian
-# 		packaging. This value should only be set when calling `make
-# 		install' and is not saved in Makefile.config
-#               (Note that DESTDIR is checked if DEST_DIR is not set.)
-#
-# STATIC: link statically
-# CYGWIN: build in Cygwin environment
-# MINGW: build with MingW compiler, link with MingW libraries
-#
-# CUSTOM_FONTCONFIG: use a custom name/path to the libfontconfig library. Useful for static linking
-#
-# VERBOSE: show full compiler invocations instead of brief progress messages
-#
-# Special for crosscompiling there are some commands available:
-#
-# UNIVERSAL_BINARY: builds a universal binary for OSX. Make sure you got both PPC and x86 libs. Only works with GCC 4 or newer
-# TRIPLE_BINARY: builds a universal binary with the addition of code optimised for G5 (which means a total of 3 binaries in one file)
-# OTTD_PPC, OTTD_PPC970, OTTD_i386: compile for target architecture.
-#    Multiple flags can be used so OTTD_PPC:=1 OTTD_i386:=1 produces the same result as UNIVERSAL_BINARY
-#
-# ENDIAN_FORCE: forces the endian-check to give a certain result. Can be BE, LE or PREPROCESSOR.
-#	PREPROCESSOR is always used on all OSX targets and will make the preprocessor pick the right endian.
-#	this means that you don't have to think about endianess when compiling for OSX.
-#	Very useful for universal binaries and crosscompilers. Not sure if it works on non OSX targets
-# WINDRES: the location of your windres
-# CC_HOST: the gcc of your localhost if you are making a target that produces incompatible executables
-# CFLAGS_HOST: cflags used for CC_HOST. Make it something if you are getting errors when you try to compi
-#		windows executables on linux. (just: CFLAGS_HOST:='-I' or something)
-
-
-##############################################################################
-#
-# Configuration
-#
-
-
-# Makefile version tag
-# it checks if the version tag in Makefile.config is the same and force update outdated config files
-MAKEFILE_VERSION:=10
-
-# Automatic configuration
-MAKE_CONFIG:=Makefile.config
-MAKEFILE:=Makefile
-LIB_DETECTION=makefiledir/Makefile.libdetection
-CONFIG_WRITER=makefiledir/Makefile.config_writer
-
-# Apply automatic configuration
-# See target section for how this is built, suppress errors
-# since first time it isn't found but make reads this twice
--include $(MAKE_CONFIG)
-
-
-# updates Makefile.config if it's outdated
-ifneq ($(MAKEFILE_VERSION),$(CONFIG_VERSION))
-	UPDATECONFIG:=upgradeconf
-	CONFIG_INCLUDED:=
-endif
-
-# this is used if there aren't any Makefile.config
-ifndef CONFIG_INCLUDED
-# sets network on by default if there aren't any config file
-ENABLE_NETWORK:=1
-
-# paths for make install
-# disabled as they would break it for some (many?) people if they were default
-#PREFIX:=/usr/local
-#DATA_DIR:=share/games/openttd
-#BINARY_DIR:=games
-#PERSONAL_DIR:=.openttd
-#USE_HOMEDIR:=1
-
--include $(LIB_DETECTION)
-endif
-
-ifdef SUPRESS_LANG_ERRORS
-LANG_ERRORS =  >/dev/null 2>&1
-endif
-
-ifdef OSX
--include os/macosx/Makefile.setup
-endif
-
-ifdef STATIC
-ifndef WIN32
-ifndef OSX
-ifndef MORPHOS
-ifndef SKIP_STATIC_CHECK
-$(error Static is only known to work on MorphOS and MacOSX!!! --- Check Makefile.config for more info and howto bypass this check)
-endif
-endif
-endif
-endif
-endif
-
-ifdef WITH_COCOA
-ifdef WITH_SDL
-$(error You can not use both the SDL video driver and the Cocoa video driver at the same time)
-endif
-ifdef DEDICATED
-$(error You can not use the Cocoa video driver in a dedicated server)
-endif
-else
-# Force SDL on UNIX platforms
-ifndef WITH_SDL
-ifdef UNIX
-ifndef DEDICATED
-$(error You need to have SDL installed in order to run OpenTTD on UNIX. Use DEDICATED if you want to compile a CLI based server)
-endif
-endif
-endif
-endif
-
-# remove the dependancy for sdl if DEDICALTED is used
-ifdef DEDICATED
-	WITH_SDL:=
-endif
-
-# add -lpthread to LDFLAGS
-ifndef WIN32
-	ifndef MORPHOS
-		ifndef OSX
-			LDFLAGS+=-lpthread
-		endif
-	endif
-endif
-
-ifdef OSX
-	LDFLAGS+=-framework Cocoa
-endif
-
-ifdef WITH_SDL
-	ifndef SDL_CONFIG
-$(error WITH_SDL can't be used when SDL_CONFIG is not set. Edit Makefile.config to correct this)
-	endif
-endif
-
-ifdef WITH_PNG
-	ifndef LIBPNG_CONFIG
-$(error WITH_PNG can't be used when LIBPNG_CONFIG is not set. Edit Makefile.config to correct this)
-	endif
-endif
-
-ifdef WITH_FREETYPE
-	ifndef FREETYPE_CONFIG
-$(error WITH_FREETYPE can't be used when FREETYPE_CONFIG is not set. Edit Makefile.config to correct this)
-	endif
-endif
-
-ifdef WITH_FONTCONFIG
-	ifndef FONTCONFIG_CONFIG
-$(error WITH_FONTCONFIG can't be used when FONTOCNFIG_CONFIG is not set. Edit Makefile.config to correct this)
-	endif
-endif
-
-##############################################################################
-#
-# Compiler configuration
-#
-
-# Executable file extension
-ifdef WIN32
-  EXE=.exe
-else
-  ifdef OS2
-    EXE=.exe
-  else
-    EXE=
-  endif
-endif
-
-# Set output executable names
-TTD=openttd$(EXE)
-ENDIAN_CHECK=endian_check$(EXE)
-STRGEN=strgen/strgen$(EXE)
-OSXAPP="OpenTTD.app"
-
-ifdef RELEASE
-REV:=$(RELEASE)
-else
-ifeq ($(shell if test -d .svn; then echo 1; fi), 1)
-REV_MODIFIED := $(shell svnversion . | sed -n 's/.*\(M\).*/\1/p' )
-REV := $(shell LC_ALL=C svn info | awk '/^URL:.*branch/ { BRANCH="-"a[split($$2, a, "/")] } /^Last Changed Rev:/ { REV="r"$$4"$(REV_MODIFIED)" } END { print REV BRANCH }')
-endif
-endif
-
-# define flag to use for -lrt (some OSes overwrites this later for compatibility)
-ifndef LRT
-ifndef MORPHOS
-LRT:= -lrt
-endif
-endif
-
-# MorphOS needs builddate
-BUILDDATE=`date +%d.%m.%y`
-
-# Check if there is a windres override
-ifndef WINDRES
-WINDRES = windres
-endif
-
-# Check that CXX is defined. If not, then it's g++
-ifndef CXX
-CXX = g++
-endif
-
-# Check if CXX_HOST is defined. If not, it is CXX
-ifndef CXX_HOST
-CXX_HOST = $(CXX)
-endif
-
-# Check if we have a new target
-ifndef CXX_TARGET
-CXX_TARGET = $(CXX_HOST)
-endif
-
-# Check if CC_HOST is defined. If not, it is CC
-ifndef CC_HOST
-CC_HOST = $(CC)
-endif
-
-ifndef CFLAGS_HOST
-CFLAGS_HOST = $(BASECFLAGS)
-endif
-
-# Check if we have a new target
-ifndef CC_TARGET
-CC_TARGET = $(CC_HOST)
-endif
-
-CC_VERSION = $(shell $(CC_TARGET) -dumpversion | cut -c 1,3)
-
-# GNU make can only test for (in)equality
-# this is a workaround to test for >=
-ifeq ($(shell expr $(CC_VERSION) \>= 29), 1)
-  CFLAGS += -O -Wall -Wno-multichar -Wsign-compare -Wundef
-  CC_CFLAGS += -Wstrict-prototypes
-  CFLAGS += -Wwrite-strings -Wpointer-arith
-endif
-ifeq ($(shell expr $(CC_VERSION) \>= 30), 1)
-  CFLAGS += -W -Wno-unused-parameter
-endif
-ifeq ($(shell expr $(CC_VERSION) \>= 34), 1)
-  CC_CFLAGS += -Wdeclaration-after-statement -Wold-style-definition
-endif
-
-ifdef DEBUG
-  ifeq ($(shell expr $(DEBUG) \>= 1), 1)
-    CFLAGS += -g -D_DEBUG
-  endif
-  ifeq ($(shell expr $(DEBUG) \>= 2), 1)
-    CFLAGS += -fno-inline
-  endif
-  ifeq ($(shell expr $(DEBUG) \>= 3), 1)
-    CFLAGS += -O0
-  endif
-endif
-
-ifdef PROFILE
-  CFLAGS += -pg
-  LDFLAGS += -pg
-  ifdef OSX
-  # Shark (Xcode's profiling tool) needs -g to relate CPU usage to line numbers in the source code
-    BASECFLAGS += -g
-  endif
-endif
-
-CDEFS=-DWITH_REV
-
-ifndef DEBUG
-ifndef PROFILE
-# Release mode
-ifndef MORPHOS
-ifndef IRIX
-# automatical strip breaks under morphos
-ifdef OSX
-# it appears that OSX can't handle automated stripping when mixing C and C++
-# we will do it manually in the target OSX_STRIP
-OSX_STRIP:=OSX_STRIP
-else
-LDFLAGS += -s
-endif
-endif
-endif
-endif
-
-ifdef OSX
-# these compilerflags makes the app run as fast as possible without making the app unstable. It works on G3 or newer
-BASECFLAGS += -O3 -funroll-loops -fsched-interblock -falign-loops=16 -falign-jumps=16 -falign-functions=16 -falign-jumps-max-skip=15 -falign-loops-max-skip=15 -mdynamic-no-pic
-else
-ifdef MORPHOS
-BASECFLAGS += -I/gg/os-include -O2 -noixemul -fstrict-aliasing -fexpensive-optimizations
-BASECFLAGS += -mcpu=604 -fno-inline -mstring -mmultiple
-else
-BASECFLAGS += -O2
-endif
-ifndef PROFILE
-ifndef IRIX
-BASECFLAGS += -fomit-frame-pointer
-endif
-endif
-endif
-endif
-
-ifdef STATIC
-ifndef OSX	# OSX can't build static if -static flag is used
-LDFLAGS += -static
-endif
-endif
-
-# If building on MingW don't link with Cygwin libs
-ifdef WIN32
-ifdef CYGWIN
-BASECFLAGS += -mwin32
-LDFLAGS += -mwin32
-endif
-ifdef MINGW
-BASECFLAGS += -mno-cygwin
-LDFLAGS += -mno-cygwin
-# -lrt fails with MINGW, so we disable it
-LRT:=
-endif
-endif
-
-CFLAGS += $(BASECFLAGS)
-
-ifdef UNIX
-CDEFS += -DUNIX
-endif
-
-ifdef BEOS
-CDEFS += -DBEOS
-LDFLAGS += -lmidi -lbe -lpthread
-ifdef WITH_NETWORK
-	ifdef BEOS_NET_SERVER
-		CDEFS += -DBEOS_NET_SERVER
-		LDFLAGS += -lnet
-	else
-		# BONE needs a few more libraries than R5
-		LDFLAGS += -lbind -lsocket
-	endif
-endif
-endif
-
-ifdef MORPHOS
-# -Wstrict-prototypes generates much noise because of system headers
-# and it also uses 4-byte bools in the C++ ABI, so C bools need to be that size as well for YAPF to work
-CFLAGS += -Wno-strict-prototypes -DFOUR_BYTE_BOOL
-endif
-
-ifdef SUNOS
-CDEFS += -DSUNOS
-ifdef WITH_NETWORK
-LDFLAGS += -lnsl -lsocket
-endif
-endif
-
-# tell the source that we are building a dedicated server
-ifdef DEDICATED
-CDEFS += -DDEDICATED
-endif
-
-# SDL config
-ifdef WITH_SDL
-CDEFS += -DWITH_SDL
-CCFLAGS_SDL := $(shell $(SDL_CONFIG) --cflags)
-CFLAGS += $(CCFLAGS_SDL)
-ifdef STATIC
-LDFLAGS_SDL := $(shell $(SDL_CONFIG) --static-libs)
-else
-LDFLAGS_SDL := $(shell $(SDL_CONFIG) --libs)
-endif
-LIBS += $(LDFLAGS_SDL)
-endif
-
-# zlib config
-ifdef WITH_ZLIB
-	CDEFS += -DWITH_ZLIB
-	ifdef STATIC
-		ifdef OSX
-		# OSX links dynamically to zlib, even in static builds since it's always present in the system
-			LIBS += -lz
-		else
-			LIBS += $(STATIC_ZLIB_PATH)
-		endif
-	else
-		LIBS += -lz
-	endif
-endif
-
-# libpng config
-ifdef WITH_PNG
-CDEFS += -DWITH_PNG
-CCFLAGS_PNG := $(shell $(LIBPNG_CONFIG) --cppflags --I_opts)
-CFLAGS += $(CCFLAGS_PNG)
-
-# seems like older libpng versions are broken and need this
-PNGCONFIG_FLAGS = --ldflags --libs
-ifdef STATIC
-ifdef OSX
-# Seems like we need a tiny hack for OSX static to work
-LDFLAGS_PNG := $(shell $(LIBPNG_CONFIG) --prefix)/lib/libpng.a
-else
-LDFLAGS_PNG := $(shell $(LIBPNG_CONFIG) --static $(PNGCONFIG_FLAGS))
-endif
-else
-LDFLAGS_PNG := $(shell $(LIBPNG_CONFIG) --L_opts $(PNGCONFIG_FLAGS))
-endif
-LIBS += $(LDFLAGS_PNG)
-endif
-
-# use std C++ lib:
-LIBS += -lstdc++
-ifndef MINGW
-	LIBS += -lc
-endif
-
-# freetype config
-ifdef WITH_FREETYPE
-CDEFS += -DWITH_FREETYPE
-CCFLAGS_FREETYPE := $(shell $(FREETYPE_CONFIG) --cflags)
-LDFLAGS_FREETYPE := $(shell $(FREETYPE_CONFIG) --libs)
-CFLAGS += $(CCFLAGS_FREETYPE)
-LIBS += $(LDFLAGS_FREETYPE)
-endif
-
-# fontconfig config
-ifdef WITH_FONTCONFIG
-CDEFS += -DWITH_FONTCONFIG
-CCFLAGS_FONTCONFIG := $(shell $(FONTCONFIG_CONFIG) --cflags)
-LDFLAGS_FONTCONFIG := $(shell $(FONTCONFIG_CONFIG) --libs)
-
-ifdef CUSTOM_FONTCONFIG
-# To allow usage of non-default libs, such as absolute path to static libs
-# not stored in Makefile.config
-LDFLAGS_FONTCONFIG := $(CUSTOM_FONTCONFIG)
-endif
-
-CFLAGS += $(CCFLAGS_FONTCONFIG)
-LIBS += $(LDFLAGS_FONTCONFIG)
-endif
-
-# iconv is enabled defaultly on OSX >= 10.3
-ifdef OSX
-	WITH_ICONV=1
-	LIBS += -liconv
-endif
-
-ifdef WITH_ICONV
-	CDEFS += -DWITH_ICONV
-	ifdef WITH_ICONV_PATH
-		CFLAGS += -I$(WITH_ICONV_PATH)
-	endif
-endif
-
-# enables/disables assert()
-ifdef DISABLE_ASSERTS
-CFLAGS += -DNDEBUG
-endif
-
-ifdef NO_THREADS
-CFLAGS += -DNO_THREADS
-endif
-
-# automatically disables asserts for release
-ifdef RELEASE
-ifndef ENABLE_ASSERTS
-CFLAGS += -DNDEBUG
-endif
-endif
-
-ifdef TRANSLATOR
-STRGEN_FLAGS=-t
-else
-STRGEN_FLAGS=
-endif
-
-# OSX specific setup
-ifdef OSX
-	# set the endian flag for OSX, that can't fail
-	ENDIAN_FORCE:=PREPROCESSOR
-
-	# -lrt fails on OSX, so we disable it
-	LRT:=
-
-	ifndef DEDICATED
-		LIBS += -framework QuickTime
-	endif
-
-	ifdef WITH_COCOA
-		CDEFS += -DWITH_COCOA
-		LIBS += -F/System/Library/Frameworks -framework Cocoa -framework Carbon -framework AudioUnit
-	endif
-
-	# OSX path setup
-	ifndef SECOND_DATA_PATH
-		SECOND_DATA_PATH:="$(OSXAPP)/Contents/Data/"
-	endif
-
-	ifndef CUSTOM_LANG_DIR
-		ifndef DEDICATED
-		CUSTOM_LANG_DIR:="$(OSXAPP)/Contents/Lang/"
-		endif
-	endif
-endif
-
-ifdef MIDI
-CDEFS += -DEXTERNAL_PLAYER=\"$(MIDI)\"
-ifdef MIDI_ARG
-CDEFS += -DMIDI_ARG=\"$(MIDI_ARG)\"
-endif
-endif
-
-ifdef WITH_NETWORK
-CDEFS += -DENABLE_NETWORK
-ifdef QNX
-LIBS += -lsocket
-endif
-endif
-
-
-ifdef SECOND_DATA_PATH
-CDEFS += -DSECOND_DATA_DIR=\"$(SECOND_DATA_PATH)/\"
-endif
-
-ifdef CUSTOM_LANG_DIR
-CDEFS += -DCUSTOM_LANG_DIR=\"$(CUSTOM_LANG_DIR)/\"
-endif
-
-ifdef WITH_DIRECTMUSIC
-CDEFS += -DWIN32_ENABLE_DIRECTMUSIC_SUPPORT
-endif
-
-ifdef WIN32
-LIBS += -lws2_32 -lwinmm -lgdi32 -ldxguid -lole32
-ifdef WITH_DIRECTMUSIC
-LIBS += -lstdc++
-endif
-TTDLDFLAGS += -Wl,--subsystem,windows
-endif
-
-ifndef DEST_DIR
-DEST_DIR = $(DESTDIR)
-endif
-
-# sets up the paths for use for make install
-ifdef INSTALL
-# We use _PREFIXED vars here, so the paths are recalculated every time, and
-# the prefix is not prepended in the makefile config
-BINARY_DIR_PREFIXED:=$(PREFIX)/$(BINARY_DIR)
-DATA_DIR_PREFIXED:=$(PREFIX)/$(DATA_DIR)
-ICON_DIR_PREFIXED:=$(PREFIX)/$(ICON_DIR)
-# We use _INSTALL vars here, these vars are the locations where the files will
-# be installed
-DATA_DIR_INSTALL=$(DEST_DIR)/$(DATA_DIR_PREFIXED)
-BINARY_DIR_INSTALL=$(DEST_DIR)/$(BINARY_DIR_PREFIXED)
-ICON_DIR_INSTALL=$(DEST_DIR)/$(ICON_DIR_PREFIXED)
-# Let the code know where to find stuff
-ifdef DATA_DIR_PREFIXED
-CDEFS += -DGAME_DATA_DIR=\"$(DATA_DIR_PREFIXED)/\"
-endif
-
-ifdef PERSONAL_DIR
-CDEFS += -DPERSONAL_DIR=\"$(PERSONAL_DIR)/\"
-endif
-
-ifdef USE_HOMEDIR
-CDEFS += -DUSE_HOMEDIR
-endif
-
-ifdef ICON_DIR
-CDEFS += -DICON_DIR=\"$(ICON_DIR_PREFIXED)/\"
-endif
-endif
-
-##############################################################################
-#
-# What to compile
-# (users do not want to modify anything below)
-#
-
-
-### Sources
-
-# clean up C_SOURCES first. Needed since building universal binaries on OSX calls the makefile recursively (just one time)
-SRCS :=
-
-SRCS += aircraft_cmd.c
-SRCS += aircraft_gui.c
-SRCS += airport.c
-SRCS += airport_gui.c
-SRCS += aystar.c
-SRCS += bmp.c
-SRCS += bridge_gui.c
-SRCS += bridge_map.c
-SRCS += build_vehicle_gui.c
-SRCS += callback_table.c
-SRCS += clear_cmd.c
-SRCS += command.c
-SRCS += console.c
-SRCS += console_cmds.c
-SRCS += currency.c
-SRCS += date.c
-SRCS += debug.c
-SRCS += dedicated.c
-SRCS += depot.c
-SRCS += depot_gui.c
-SRCS += disaster_cmd.c
-SRCS += dock_gui.c
-SRCS += driver.c
-SRCS += dummy_land.c
-SRCS += economy.c
-SRCS += elrail.c
-SRCS += engine.c
-SRCS += engine_gui.c
-SRCS += fileio.c
-SRCS += fios.c
-SRCS += fontcache.c
-SRCS += genworld.c
-SRCS += genworld_gui.c
-SRCS += gfx.c
-SRCS += gfxinit.c
-SRCS += graph_gui.c
-SRCS += heightmap.c
-SRCS += helpers.cpp
-SRCS += industry_cmd.c
-SRCS += industry_gui.c
-SRCS += intro_gui.c
-SRCS += landscape.c
-SRCS += main_gui.c
-SRCS += map.c
-SRCS += md5.c
-SRCS += mersenne.c
-SRCS += minilzo.c
-SRCS += misc.c
-SRCS += misc_cmd.c
-SRCS += misc_gui.c
-SRCS += mixer.c
-SRCS += music.c
-SRCS += music_gui.c
-SRCS += namegen.c
-SRCS += network/core/packet.c
-SRCS += network/core/tcp.c
-SRCS += network/core/udp.c
-SRCS += network/network.c
-SRCS += network/network_client.c
-SRCS += network/network_data.c
-SRCS += network/network_gamelist.c
-SRCS += network/network_gui.c
-SRCS += network/network_server.c
-SRCS += network/network_udp.c
-SRCS += newgrf.c
-SRCS += newgrf_cargo.c
-SRCS += newgrf_config.c
-SRCS += newgrf_engine.c
-SRCS += newgrf_gui.c
-SRCS += newgrf_sound.c
-SRCS += newgrf_spritegroup.c
-SRCS += newgrf_station.c
-SRCS += newgrf_text.c
-SRCS += news_gui.c
-SRCS += npf.c
-SRCS += oldloader.c
-SRCS += oldpool.c
-SRCS += openttd.c
-SRCS += order_cmd.c
-SRCS += order_gui.c
-SRCS += os_timer.c
-SRCS += pathfind.c
-SRCS += player_gui.c
-SRCS += players.c
-SRCS += queue.c
-SRCS += rail.c
-SRCS += rail_cmd.c
-SRCS += rail_gui.c
-SRCS += rev.c
-SRCS += road_cmd.c
-SRCS += road_gui.c
-SRCS += road_map.c
-SRCS += roadveh_cmd.c
-SRCS += roadveh_gui.c
-SRCS += saveload.c
-SRCS += screenshot.c
-SRCS += settings.c
-SRCS += settings_gui.c
-SRCS += ship_cmd.c
-SRCS += ship_gui.c
-SRCS += signs.c
-SRCS += smallmap_gui.c
-SRCS += sound.c
-SRCS += spritecache.c
-SRCS += station_cmd.c
-SRCS += station_gui.c
-SRCS += station_map.c
-SRCS += string.c
-SRCS += strings.c
-SRCS += subsidy_gui.c
-SRCS += terraform_gui.c
-SRCS += texteff.c
-SRCS += tgp.c
-SRCS += thread.c
-SRCS += tile.c
-SRCS += town_cmd.c
-SRCS += town_gui.c
-SRCS += train_cmd.c
-SRCS += train_gui.c
-SRCS += tree_cmd.c
-SRCS += tunnel_map.c
-SRCS += tunnelbridge_cmd.c
-SRCS += unmovable_cmd.c
-SRCS += vehicle.c
-SRCS += vehicle_gui.c
-SRCS += viewport.c
-SRCS += water_cmd.c
-SRCS += waypoint.c
-SRCS += widget.c
-SRCS += window.c
-SRCS += music/null_m.c
-SRCS += sound/null_s.c
-SRCS += video/dedicated_v.c
-SRCS += video/null_v.c
-SRCS += yapf/follow_track.cpp
-SRCS += yapf/yapf_common.cpp
-SRCS += yapf/yapf_rail.cpp
-SRCS += yapf/yapf_road.cpp
-SRCS += yapf/yapf_ship.cpp
-
-# AI related files
-SRCS += ai/ai.c
-SRCS += ai/default/default.c
-SRCS += ai/trolly/build.c
-SRCS += ai/trolly/pathfinder.c
-SRCS += ai/trolly/shared.c
-SRCS += ai/trolly/trolly.c
-
-ifdef WITH_SDL
-  SRCS += sdl.c
-  SRCS += sound/sdl_s.c
-  SRCS += video/sdl_v.c
-endif
-
-ifdef WIN32
-  SRCS += win32.c
-  SRCS += music/win32_m.c
-  SRCS += sound/win32_s.c
-  SRCS += video/win32_v.c
-else
-  SRCS += unix.c
-  SRCS += music/extmidi.c
-endif
-
-ifdef OSX
-	SRCS += os/macosx/macos.m
-	ifndef DEDICATED
-		SRCS += music/qtmidi.c
-	endif
-	ifdef WITH_COCOA
-		SRCS += video/cocoa_v.m
-		SRCS += sound/cocoa_s.c
-		SRCS += os/macosx/splash.c
-	endif
-endif
-
-ifdef BEOS
-  SRCS += music/bemidi.cpp
-endif
-
-ifdef WIN32
-  SRCS += ottdres.rc
-endif
-
-ifdef WITH_DIRECTMUSIC
-  SRCS += music/dmusic.cpp
-endif
-
-OBJS += $(filter %.o, $(SRCS:%.cpp=%.o) $(SRCS:%.m=%.o) $(SRCS:%.c=%.o) $(SRCS:%.rc=%.o))
-DEPS = $(OBJS:%.o=.deps/%.d)
-
-LANG_TXT = $(filter-out %.unfinished.txt,$(wildcard lang/*.txt))
-LANGS = $(LANG_TXT:%.txt=%.lng)
-
-
-##############################################################################
-#
-# Build commands
-#
-
-# If we are verbose, we will show commands prefixed by $(Q).
-# The $(Q)s get replaced by @ in non-verbose mode.
-# Inspired by the Linux kernel build system.
-ifdef VERBOSE
-	Q =
-else
-	Q = @
-endif
-
-
-##############################################################################
-#
-# Targets
-#
-
-
-### Normal build rules
-
-
-ifdef OSX
-# needs to be before all
-OSX:=OSX
-endif
-
-
-all: endian_target.h endian_host.h $(UPDATECONFIG) $(LANGS) $(TTD) $(OSX)
-
-ifdef OSX
--include os/macosx/Makefile
-endif
-
-endian_host.h: $(ENDIAN_CHECK)
-	@echo '===> Testing endianness for host'
-	$(Q)./$(ENDIAN_CHECK) > $@
-
-endian_target.h: $(ENDIAN_CHECK)
-	@echo '===> Testing endianness for target'
-	$(Q)./$(ENDIAN_CHECK) $(ENDIAN_FORCE) > $@
-
-$(ENDIAN_CHECK): endian_check.c
-	@echo '===> Compiling and Linking $@'
-	$(Q)$(CC_HOST) $(CFLAGS_HOST) $(CDEFS) $< -o $@
-
-
-ifndef MACOSX_BUILD
-# OSX links in os/macosx/Makefile to handle universal binaries better
-$(TTD): $(OBJS) $(MAKE_CONFIG)
-	@echo '===> Linking $@'
-	$(Q)$(CXX_TARGET) $(LDFLAGS) $(TTDLDFLAGS) $(OBJS) $(LIBS) -o $@
-endif
-
-$(STRGEN): strgen/strgen.c string.c endian_host.h table/control_codes.h
-	@echo '===> Compiling and Linking $@'
-	$(Q)$(CC_HOST) $(CFLAGS_HOST) -DSTRGEN strgen/strgen.c string.c -o $@
-
-table/strings.h: lang/english.txt $(STRGEN)
-	@echo '===> Generating $@'
-	$(Q)$(STRGEN) -s lang -d table
-
-lang/%.lng: lang/%.txt $(STRGEN) lang/english.txt
-	@echo '===> Compiling language $(*F)'
-	$(Q)$(STRGEN) $(STRGEN_FLAGS) -s lang -d lang $< $(LANG_ERRORS) || rm -f $@
-
-ifdef MORPHOS
-
-release: all
-	$(Q)rm -fr "/t/openttd-$(RELEASE)-morphos.lha"
-	$(Q)mkdir -p "/t/"
-	$(Q)mkdir -p "/t/openttd-$(RELEASE)-morphos"
-	$(Q)mkdir -p "/t/openttd-$(RELEASE)-morphos/docs"
-	$(Q)mkdir -p "/t/openttd-$(RELEASE)-morphos/data"
-	$(Q)mkdir -p "/t/openttd-$(RELEASE)-morphos/lang"
-	$(Q)mkdir -p "/t/openttd-$(RELEASE)-morphos/scenario"
-	$(Q)mkdir -p "/t/openttd-$(RELEASE)-morphos/scenario/heightmap"
-	$(Q)cp -R $(TTD)                      "/t/openttd-$(RELEASE)-morphos/"
-	$(Q)cp data/*                         "/t/openttd-$(RELEASE)-morphos/data/"
-	$(Q)cp lang/*.lng                     "/t/openttd-$(RELEASE)-morphos/lang/"
-	$(Q)-cp scenario/*.scn                "/t/openttd-$(RELEASE)-morphos/scenario/"
-	$(Q)-cp scenario/heightmap/*          "/t/openttd-$(RELEASE)-morphos/scenario/heightmap/"
-	$(Q)cp readme.txt                     "/t/openttd-$(RELEASE)-morphos/docs/ReadMe"
-	$(Q)cp docs/console.txt               "/t/openttd-$(RELEASE)-morphos/docs/Console"
-	$(Q)cp COPYING                        "/t/openttd-$(RELEASE)-morphos/docs/"
-	$(Q)cp changelog.txt                  "/t/openttd-$(RELEASE)-morphos/docs/ChangeLog"
-	$(Q)cp known-bugs.txt                 "/t/openttd-$(RELEASE)-morphos/docs/known-bugs.txt"
-	$(Q)cp os/morphos/icons/openttd.info  "/t/openttd-$(RELEASE)-morphos/$(TTD).info"
-	$(Q)cp os/morphos/icons/docs.info     "/t/openttd-$(RELEASE)-morphos/docs.info"
-	$(Q)cp os/morphos/icons/drawer.info   "/t/openttd-$(RELEASE)-morphos.info"
-	$(Q)cp os/morphos/icons/document.info "/t/openttd-$(RELEASE)-morphos/docs/ReadMe.info"
-	$(Q)cp os/morphos/icons/document.info "/t/openttd-$(RELEASE)-morphos/docs/Console.info"
-	$(Q)cp os/morphos/icons/document.info "/t/openttd-$(RELEASE)-morphos/docs/COPYING.info"
-	$(Q)cp os/morphos/icons/document.info "/t/openttd-$(RELEASE)-morphos/docs/ChangeLog.info"
-	$(Q)strip --strip-all --strip-unneeded --remove-section .comment "/t/openttd-$(RELEASE)-morphos/$(TTD)"
-	$(Q)lha a -r "t:openttd-$(RELEASE)-morphos.lha" "t:openttd-$(RELEASE)-morphos"
-	$(Q)lha a    "t:openttd-$(RELEASE)-morphos.lha" "t:openttd-$(RELEASE)-morphos.info"
-	$(Q)rm -fr "/t/openttd-$(RELEASE)-morphos"
-	$(Q)rm -fr "/t/openttd-$(RELEASE)-morphos.info"
-	@echo "Release archive can be found in RAM:t/ now."
-
-.PHONY: release
-endif
-
-rev.c: FORCE
-	@# setting the revision number in a place, there the binary can read it
-	@echo 'const char _openttd_revision[] = "$(REV)";' >>rev.c.new
-	@# some additions for MorphOS versions tag
-	@echo '#ifdef __MORPHOS__'  >>rev.c.new
-	@echo 'const char morphos_versions_tag[] = "\\0$$VER: OpenTTD $(REV) ('${BUILDDATE}') © OpenTTD Team [MorphOS, PowerPC]";'  >>rev.c.new
-	@echo '#endif' >>rev.c.new
-	@# Only update the real rev.c if it actually changed, to prevent
-	@# useless rebuilds.
-	@cmp -s rev.c rev.c.new 2>/dev/null || mv rev.c.new rev.c
-	@rm -f rev.c.new
-
-FORCE:
-
-
-clean:
-	@echo '===> Cleaning up'
-# endian.h is out-dated and no longer in use, so it can be removed soon
-	$(Q)rm -rf .deps *~ $(TTD) $(STRGEN) core table/strings.h $(LANGS) $(OBJS) $(OSX_MIDI_PLAYER_FILE) endian.h endian_host.h endian_target.h $(ENDIAN_CHECK) .OSX
-
-mrproper: clean
-	$(Q)rm -rf $(MAKE_CONFIG)
-
-ifndef OSX
-ifndef MORPHOS
-install:
-ifeq ($(INSTALL),)
-	$(error make install is highly experimental at his state and not\
-	tested very much - use at your own risk - to use run \"make install INSTALL:=1\" - make sure Makefile.config\
-	is set correctly up - run \"make upgradeconf\")
-endif
-
-ifeq ($(PREFIX), )
-	$(error no prefix set - check Makefile.config)
-endif
-#	We compare against the non prefixed version here, so we won't install
-#	if only the prefix has been set
-ifeq ($(DATA_DIR),)
-	$(error no data path set - check Makefile.config)
-endif
-ifeq ($(BINARY_DIR),)
-	$(error no binary path set - check Makefile.config)
-endif
-# We'll install in $DEST_DIR instead of root if it is set (we don't
-# care about extra /'s
-	install -d $(DATA_DIR_INSTALL)/lang \
-	           $(DATA_DIR_INSTALL)/data \
-	           $(DATA_DIR_INSTALL)/gm \
-						 $(ICON_DIR_INSTALL) \
-	           $(BINARY_DIR_INSTALL)
-ifndef USE_HOMEDIR
-	mkdir -p $(PERSONAL_DIR)/scenario
-	mkdir -p $(PERSONAL_DIR)/scenario/heightmap
-else
-	mkdir -p $(DATA_DIR_INSTALL)/scenario
-	mkdir -p $(DATA_DIR_INSTALL)/scenario/heightmap
-endif
-	install $(TTD) $(BINARY_DIR_INSTALL)
-	install -m 644 lang/*.lng $(DATA_DIR_INSTALL)/lang
-	install -m 644 data/*.grf $(DATA_DIR_INSTALL)/data
-	install -m 644 data/opntitle.dat $(DATA_DIR_INSTALL)/data
-	# Generic menu icon
-	install -m 644 media/openttd.64.png $(ICON_DIR_INSTALL)
-	# Debian menu icon
-	install -m 644 media/openttd.32.xpm $(ICON_DIR_INSTALL)
-	# Window icon
-	install -m 644 media/openttd.32.bmp $(ICON_DIR_INSTALL)
-else	#MorphOS
-install:
-	$(error make install is not supported on MorphOS)
-endif
-else	# OSX
-install:
-	$(error make install is not supported on MacOSX)
-endif
-
-
-love:
-	@echo "YES! I thought you would never ask. We will have a great time. You can keep me turned on all night"
-
-.PHONY: clean all $(OSX) install love
-
-
-### Automatic configuration
--include $(CONFIG_WRITER)
-
-
-# Export all variables set to subprocesses (a bit dirty)
-.EXPORT_ALL_VARIABLES:
-upgradeconf: $(MAKE_CONFIG)
-	$(Q)rm $(MAKE_CONFIG)
-	$(Q)$(MAKE) $(MAKE_CONFIG)
-
-.PHONY: upgradeconf
-
-
-### Internal build rules
-
-# This makes sure the .deps dir is always around.
-DEPS_MAGIC := $(shell mkdir -p $(sort $(dir $(DEPS))))
-
-depend:
-	@true # The include handles this automagically
-
-# Introduce the dependencies
-ifeq ($(findstring $(MAKECMDGOALS), clean info mrproper upgradeconf $(MAKE_CONFIG)),)
--include $(DEPS)
-endif
-
-# Silence stale header dependency errors
-%.h:
-	@true
-
-.deps/%.d: %.c $(MAKE_CONFIG) table/strings.h endian_target.h
-	@echo '===> DEP $<'
-	$(Q)$(CC_TARGET) $(CFLAGS) $(CDEFS) -MM $< | sed 's#^$(@F:%.d=%.o):#$@ $(@:.deps/%.d=%.o):#' > $@
-
-.deps/%.d: %.cpp $(MAKE_CONFIG) table/strings.h endian_target.h
-	@echo '===> DEP $<'
-	$(Q)$(CXX_TARGET) $(CFLAGS) $(CDEFS) -MM $< | sed 's#^$(@F:%.d=%.o):#$@ $(@:.deps/%.d=%.o):#' > $@
-
-.deps/%.d: %.m $(MAKE_CONFIG) table/strings.h endian_target.h
-	@echo '===> DEP $<'
-	$(Q)$(CC_TARGET) $(OBJCFLAGS) $(CDEFS) -MM $< | sed 's#^$(@F:%.d=%.o):#$@ $(@:.deps/%.d=%.o):#' > $@
-
-
-ifndef MACOSX_BUILD
-# OSX uses os/macosx/Makefile to compile files
-%.o: %.c $(MAKE_CONFIG)
-	@echo '===> Compiling $<'
-	$(Q)$(CC_TARGET) $(CC_CFLAGS) $(CFLAGS) $(CDEFS) -c -o $@ $<
-
-%.o: %.cpp  $(MAKE_CONFIG)
-	@echo '===> Compiling $<'
-	$(Q)$(CXX_TARGET) $(CFLAGS) $(CDEFS) -c -o $@ $<
-
-%.o: %.m  $(MAKE_CONFIG)
-	@echo '===> Compiling $<'
-	$(Q)$(CC_TARGET) $(CC_CFLAGS) $(CFLAGS) $(CDEFS) -c -o $@ $<
-endif
-
-%.o: %.rc
-	@echo '===> Compiling resource $<'
-	$(Q)$(WINDRES) -o $@ $<
-
-
-info:
-	@echo 'CFLAGS  = $(CFLAGS)'
-	@echo 'LDFLAGS = $(LDFLAGS)'
-	@echo 'LIBS    = $(LIBS)'
-	@echo 'CDEFS   = $(CDEFS)'
diff --git a/Makefile.in b/Makefile.in
new file mode 100644
index 000000000..6c1131abf
--- /dev/null
+++ b/Makefile.in
@@ -0,0 +1,249 @@
+# Auto-generated file -- DO NOT EDIT
+
+# Check if we want to show what we are doing
+ifdef VERBOSE
+	Q =
+else
+	Q = @
+endif
+
+include Makefile.am
+
+SOURCE_LIST = !!SOURCE_LIST!!
+CONFIG_CACHE_SOURCE_LIST = !!CONFIG_CACHE_SOURCE_LIST!!
+CONFIGURE_FILES = !!CONFIGURE_FILES!!
+LIPO = !!LIPO!!
+BIN_DIR = !!BIN_DIR!!
+SRC_DIR = !!SRC_DIR!!
+ROOT_DIR = !!ROOT_DIR!!
+BUNDLE_DIR = "$(ROOT_DIR)/bundle"
+BUNDLES_DIR = "$(ROOT_DIR)/bundles"
+INSTALL_DIR = !!INSTALL_DIR!!
+INSTALL_BINARY_DIR = "$(INSTALL_DIR)/"!!BINARY_DIR!!
+INSTALL_ICON_DIR = "$(INSTALL_DIR)/"!!ICON_DIR!!
+INSTALL_DATA_DIR = "$(INSTALL_DIR)/"!!DATA_DIR!!
+INSTALL_PERSONAL_DIR = !!PERSONAL_DIR!!
+# TODO: ENABLE_INSTALL should be removed when the search path patch has been applied
+ENABLE_INSTALL = !!ENABLE_INSTALL!!
+TTD = !!TTD!!
+TTDS = $(SRC_DIRS:%=%/$(TTD))
+OS = !!OS!!
+OSXAPP = !!OSXAPP!!
+
+RES := $(shell if ! [ -f $(CONFIG_CACHE_SOURCE_LIST) ] || [ -n "`cmp $(CONFIG_CACHE_SOURCE_LIST) $(SOURCE_LIST)`" ]; then cp $(SOURCE_LIST) $(CONFIG_CACHE_SOURCE_LIST); fi )
+
+all: config.cache
+	@for dir in $(DIRS); do \
+		$(MAKE) -C $$dir all; \
+	done
+ifdef LIPO
+# Lipo is an OSX thing. If it is defined, it means we are building for universal,
+# and so we have have to combine the binaries into one big binary
+
+# Remove the last binary made by the last compiled target
+	rm -f $(BIN_DIR)/$(TTD)
+# Make all the binaries into one
+	$(LIPO) -create -output $(BIN_DIR)/$(TTD) $(TTDS)
+endif
+
+config.cache: $(CONFIG_CACHE_SOURCE_LIST) $(CONFIGURE_FILES)
+ifeq ($(shell if test -f config.cache; then echo 1; fi), 1)
+	@echo "----------------"
+	@echo "The system detected that source.list or any configure file is altered."
+	@echo " Going to reconfigure with last known settings..."
+	@echo "----------------"
+# Make sure we don't lock config.cache
+	@$(shell cat config.cache) || exit 1
+	@echo "----------------"
+	@echo "Reconfig done. Now compiling..."
+	@echo "----------------"
+else
+	@echo "----------------"
+	@echo "Have not found a configuration, please run configure first."
+	@echo "----------------"
+	@exit 1
+endif
+
+clean:
+	@for dir in $(DIRS); do \
+		$(MAKE) -C $$dir clean; \
+	done
+	$(Q)rm -rf $(BUNDLE_TARGET)
+
+lang:
+	@for dir in $(LANG_DIRS); do \
+		$(MAKE) -C $$dir all; \
+	done
+
+mrproper:
+	@for dir in $(DIRS); do \
+		$(MAKE) -C $$dir mrproper; \
+		rm -f $$dir/Makefile; \
+	done
+	$(Q)rm -rf objs
+	$(Q)rm -f Makefile Makefile.am
+	$(Q)rm -f $(CONFIG_CACHE_SOURCE_LIST) config.cache config.log
+	$(Q)rm -rf $(BUNDLE_DIR)
+	$(Q)rm -rf $(BUNDLES_DIR)
+
+depend:
+	@for dir in $(SRC_DIRS); do \
+		$(MAKE) -C $$dir depend; \
+	done
+
+run: all
+	$(Q)cd !!BIN_DIR!! && ./!!TTD!!
+
+%.o:
+	@for dir in $(SRC_DIRS); do \
+		$(MAKE) -C $$dir $@; \
+	done
+
+%.lng:
+	@for dir in $(LANG_DIRS); do \
+		$(MAKE) -C $$dir $@; \
+	done
+
+#
+# Creation of bundles
+#
+
+# The revision is needed for the bundle name and creating an OSX application bundle.
+ifdef REVISION
+REV := $(REVISION)
+else
+# Are we a SVN dir?
+ifeq ($(shell if test -d $(SRC_DIR)/.svn; then echo 1; fi), 1)
+# Find if the local source if modified
+REV_MODIFIED := $(shell svnversion $(SRC_DIR) | sed -n 's/.*\(M\).*/\1/p' )
+# Find the revision like: rXXXX-branch
+REV := $(shell LC_ALL=C svn info $(SRC_DIR) | awk '/^URL:.*branches/ { split($$2, a, "/"); BRANCH="-"a[5] } /^Last Changed Rev:/ { REV="r"$$4"$(REV_MODIFIED)" } END { print REV BRANCH }')
+endif
+endif
+# Make sure we have something in REV
+ifeq ($(REV),)
+REV := norev000
+endif
+
+ifndef BUNDLE_NAME
+BUNDLE_NAME = OTTD-$(OS)-custom-$(REV)
+endif
+
+# An OSX application bundle needs the data files, lang files and openttd executable in a different location.
+ifdef OSXAPP
+DATA_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Data
+LANG_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Lang
+TTD_DIR  = $(BUNDLE_DIR)/$(OSXAPP)/Contents/MacOS
+else
+DATA_DIR = $(BUNDLE_DIR)/data
+LANG_DIR = $(BUNDLE_DIR)/lang
+TTD_DIR  = $(BUNDLE_DIR)
+endif
+
+bundle: all
+	@echo '[BUNDLE] Constructing bundle'
+	$(Q)rm -rf   "${BUNDLE_DIR}"
+	$(Q)mkdir -p "${BUNDLE_DIR}"
+	$(Q)mkdir -p "$(BUNDLE_DIR)/docs"
+	$(Q)mkdir -p "$(BUNDLE_DIR)/scenario"
+	$(Q)mkdir -p "$(BUNDLE_DIR)/scenario/heightmap"
+	$(Q)mkdir -p "$(BUNDLE_DIR)/media"
+	$(Q)mkdir -p "$(TTD_DIR)"
+	$(Q)mkdir -p "$(DATA_DIR)"
+	$(Q)mkdir -p "$(LANG_DIR)"
+ifdef OSXAPP
+	$(Q)mkdir -p "$(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources"
+	$(Q)echo "APPL????" >                                          "$(BUNDLE_DIR)/$(OSXAPP)/Contents/PkgInfo"
+	$(Q)cp    "$(ROOT_DIR)/os/macosx/openttd.icns"                 "$(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/openttd.icns"
+	$(Q)$(ROOT_DIR)/os/macosx/plistgen.sh                          "${BUNDLE_DIR}/$(OSXAPP)" "$(REV)"
+	$(Q)cp    "$(ROOT_DIR)/docs/OSX_install_instructions.txt"      "$(BUNDLE_DIR)/docs/"
+	$(Q)cp    "$(ROOT_DIR)/docs/OSX_why_multiple_applications.txt" "$(BUNDLE_DIR)/docs/"
+	$(Q)cp    "$(ROOT_DIR)/os/macosx/splash.png"                   "$(DATA_DIR)"
+endif
+	$(Q)cp "$(BIN_DIR)/$(TTD)"                "$(TTD_DIR)/"
+	$(Q)cp "$(BIN_DIR)/data/"*.grf            "$(DATA_DIR)/"
+	$(Q)cp "$(BIN_DIR)/data/opntitle.dat"     "$(DATA_DIR)/"
+	$(Q)cp "$(BIN_DIR)/lang/"*.lng            "$(LANG_DIR)/"
+	$(Q)cp "$(ROOT_DIR)/readme.txt"           "$(BUNDLE_DIR)/"
+	$(Q)cp "$(ROOT_DIR)/COPYING"              "$(BUNDLE_DIR)/"
+	$(Q)cp "$(ROOT_DIR)/known-bugs.txt"       "$(BUNDLE_DIR)/docs/"
+	$(Q)cp "$(ROOT_DIR)/docs/multiplayer.txt" "$(BUNDLE_DIR)/docs/"
+	$(Q)cp "$(ROOT_DIR)/changelog.txt"        "$(BUNDLE_DIR)/docs/"
+	$(Q)cp "$(ROOT_DIR)/media/openttd.64.png" "$(BUNDLE_DIR)/media/"
+	$(Q)cp "$(ROOT_DIR)/media/openttd.32.xpm" "$(BUNDLE_DIR)/media/"
+	$(Q)cp "$(ROOT_DIR)/media/openttd.32.bmp" "$(BUNDLE_DIR)/media/"
+ifeq ($(shell if test -d $(BIN_DIR)/scenario/*.scn; then echo 1; fi), 1)
+	$(Q)cp "$(BIN_DIR)/scenario/"*.scn        "$(BUNDLE_DIR)/scenario/"
+endif
+ifeq ($(shell if test -d $(BIN_DIR)/scenario/heightmaps/*; then echo 1; fi), 1)
+	$(Q)cp "$(BIN_DIR)/scenario/heightmaps/"* "$(BUNDLE_DIR)/scenario/heightmap/"
+endif
+
+### Packing the current bundle into several compressed file formats ###
+#
+# Zips & dmgs do not contain a root folder, i.e. they have files in the root of the zip/dmg.
+# gzip, bzip2 and lha archives have a root folder, with the same name as the bundle.
+#
+# One can supply a custom name by adding BUNDLE_NAME:=<name> to the make command.
+#
+bundle_zip: bundle
+	@echo '[BUNDLE] Creating $(BUNDLE_NAME).zip'
+	$(Q)mkdir -p "$(BUNDLES_DIR)"
+	$(Q)cd "$(BUNDLE_DIR)" && zip -r $(shell if test -z "$(VERBOSE)"; then echo '-q'; fi) "$(BUNDLES_DIR)/$(BUNDLE_NAME).zip" .
+
+bundle_gzip: bundle
+	@echo '[BUNDLE] Creating $(BUNDLE_NAME).tar.gz'
+	$(Q)mkdir -p "$(BUNDLES_DIR)/.gzip/$(BUNDLE_NAME)"
+	$(Q)cp -R    "$(BUNDLE_DIR)/"* "$(BUNDLES_DIR)/.gzip/$(BUNDLE_NAME)/"
+	$(Q)cd "$(BUNDLES_DIR)/.gzip" && tar -zc$(shell if test -n "$(VERBOSE)"; then echo 'v'; fi)f "$(BUNDLES_DIR)/$(BUNDLE_NAME).tar.gz" "$(BUNDLE_NAME)"
+	$(Q)rm -rf   "$(BUNDLES_DIR)/.gzip"
+
+bundle_bzip2: bundle
+	@echo '[BUNDLE] Creating $(BUNDLE_NAME).tar.bz2'
+	$(Q)mkdir -p "$(BUNDLES_DIR)/.bzip2/$(BUNDLE_NAME)"
+	$(Q)cp -R    "$(BUNDLE_DIR)/"* "$(BUNDLES_DIR)/.bzip2/$(BUNDLE_NAME)/"
+	$(Q)cd "$(BUNDLES_DIR)/.bzip2" && tar -jc$(shell if test -n "$(VERBOSE)"; then echo 'v'; fi)f "$(BUNDLES_DIR)/$(BUNDLE_NAME).tar.bz2" "$(BUNDLE_NAME)"
+	$(Q)rm -rf   "$(BUNDLES_DIR)/.bzip2"
+
+bundle_lha: bundle
+	@echo '[BUNDLE] Creating $(BUNDLE_NAME).lha'
+	$(Q)mkdir -p "$(BUNDLES_DIR)/.lha/$(BUNDLE_NAME)"
+	$(Q)cp -R    "$(BUNDLE_DIR)/"* "$(BUNDLES_DIR)/.lha/$(BUNDLE_NAME)/"
+	$(Q)cd "$(BUNDLES_DIR)/.lha" && lha ao6 "$(BUNDLES_DIR)/$(BUNDLE_NAME).lha" "$(BUNDLE_NAME)"
+	$(Q)rm -rf   "$(BUNDLES_DIR)/.lha"
+
+bundle_dmg: bundle
+	@echo '[BUNDLE] Creating $(BUNDLE_NAME).dmg'
+	$(Q)mkdir -p "$(BUNDLES_DIR)"
+	$(Q)hdiutil create -ov -format UDZO -srcfolder "$(BUNDLE_DIR)" "$(BUNDLES_DIR)/$(BUNDLE_NAME).dmg"
+
+# TODO: ENABLE_INSTALL should be removed when the search path patch has been applied
+ifeq ($(ENABLE_INSTALL), 0)
+install:
+	@echo '[INSTALL] Cannot install. Not compiled with installation paths'
+else
+ifdef OSXAPP
+install:
+	@echo '[INSTALL] Cannot install the OSX Application Bundle'
+else
+install: bundle
+	@echo '[INSTALL] Installing OpenTTD'
+	$(Q)install -d "$(INSTALL_BINARY_DIR)"
+	$(Q)install -d "$(INSTALL_ICON_DIR)"
+	$(Q)install -d "$(INSTALL_DATA_DIR)/gm"
+	$(Q)install -d "$(INSTALL_DATA_DIR)/data"
+	$(Q)install -d "$(INSTALL_DATA_DIR)/lang"
+	$(Q)install -d "$(INSTALL_DATA_DIR)/docs"
+	$(Q)install -m 755 "$(BUNDLE_DIR)/$(TTD)" "$(INSTALL_BINARY_DIR)"
+	$(Q)install -m 644 "$(BUNDLE_DIR)/lang/"* "$(INSTALL_DATA_DIR)/lang"
+	$(Q)install -m 644 "$(BUNDLE_DIR)/data/"* "$(INSTALL_DATA_DIR)/data"
+	$(Q)install -m 644 "$(BUNDLE_DIR)/docs/"* "$(INSTALL_DATA_DIR)/docs"
+	$(Q)install -m 644 "$(BUNDLE_DIR)/media/"* "$(INSTALL_ICON_DIR)"
+ifdef INSTALL_PERSONAL_DIR
+	$(Q)mkdir -p ~/"$(INSTALL_PERSONAL_DIR)"
+	$(Q)cp -R "$(BUNDLE_DIR)/scenario" ~/"$(INSTALL_PERSONAL_DIR)"
+else
+	$(Q)cp -R "$(BUNDLE_DIR)/scenario" "$(INSTALL_DATA_DIR)"
+endif # INSTALL_PERSONAL_DIR
+endif # OSXAPP
+endif # ENABLE_INSTALL
diff --git a/Makefile.lang.in b/Makefile.lang.in
new file mode 100644
index 000000000..a12e69601
--- /dev/null
+++ b/Makefile.lang.in
@@ -0,0 +1,85 @@
+# Auto-generated file -- DO NOT EDIT
+
+STRGEN       = !!STRGEN!!
+ENDIAN_CHECK = !!ENDIAN_CHECK!!
+SRC_DIR      = !!SRC_DIR!!
+LANG_DIR     = !!LANG_DIR!!
+BIN_DIR      = !!BIN_DIR!!
+LANGS_SRC    = $(shell ls $(LANG_DIR)/*.txt)
+LANGS        = $(LANGS_SRC:$(LANG_DIR)/%.txt=%.lng)
+CC_BUILD     = !!CC_BUILD!!
+CFLAGS_BUILD = !!CFLAGS_BUILD!!
+STRGEN_FLAGS = !!STRGEN_FLAGS!!
+STAGE        = !!STAGE!!
+LANG_SUPPRESS= !!LANG_SUPPRESS!!
+LANG_OBJS_DIR= !!LANG_OBJS_DIR!!
+
+ifeq ($(LANG_SUPPRESS), yes)
+LANG_ERRORS = >/dev/null 2>&1
+endif
+
+# Make sure endian_host.h is reasable as if it was in the src/ dir
+CFLAGS_BUILD += -I $(LANG_OBJS_DIR)
+
+ENDIAN_TARGETS := endian_host.h endian_target.h $(ENDIAN_CHECK)
+
+# Check if we want to show what we are doing
+ifdef VERBOSE
+	Q =
+	E = @true
+else
+	Q = @
+	E = @echo
+endif
+
+RES := $(shell mkdir -p $(BIN_DIR)/lang )
+
+all: table/strings.h $(LANGS)
+
+strgen.o: $(SRC_DIR)/strgen/strgen.c endian_host.h
+	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.c=%.c)'
+	$(Q)$(CC_BUILD) $(CFLAGS_BUILD) -DSTRGEN -c -o $@ $<
+
+string.o: $(SRC_DIR)/string.c endian_host.h
+	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.c=%.c)'
+	$(Q)$(CC_BUILD) $(CFLAGS_BUILD) -DSTRGEN -c -o $@ $<
+
+lang/english.txt: $(LANG_DIR)/english.txt
+	$(Q)mkdir -p lang
+	$(Q)cp $(LANG_DIR)/english.txt lang/english.txt
+
+$(STRGEN): string.o strgen.o
+	$(E) '$(STAGE) Compiling and Linking $@'
+	$(Q)$(CC_BUILD) string.o strgen.o -o $@
+
+table/strings.h: lang/english.txt $(STRGEN)
+	$(E) '$(STAGE) Generating $@'
+	@mkdir -p table
+	$(Q)./$(STRGEN) -s $(LANG_DIR) -d table
+
+$(LANGS): %.lng: $(LANG_DIR)/%.txt $(STRGEN) lang/english.txt
+	$(E) '$(STAGE) Compiling language $(*F)'
+	$(Q)./$(STRGEN) $(STRGEN_FLAGS) -s $(LANG_DIR) -d $(LANG_OBJS_DIR) $< $(LANG_ERRORS) && cp $@ $(BIN_DIR)/lang
+
+# The targets to compile the endian-code
+
+endian_host.h: $(ENDIAN_CHECK)
+	$(E) '$(STAGE) Testing endianness for host'
+	$(Q)./$(ENDIAN_CHECK) > $@
+
+$(ENDIAN_CHECK): $(SRC_DIR)/endian_check.c
+	$(E) '$(STAGE) Compiling and Linking $@'
+	$(Q)$(CC_BUILD) $(CFLAGS_BUILD) $< -o $@
+
+depend:
+
+clean:
+	$(E) '$(STAGE) Cleaning up language files'
+	$(Q)rm -f strgen.o table/strings.h $(STRGEN) $(LANGS) $(LANGS:%=$(BIN_DIR)/lang/%) lang/english.* $(ENDIAN_TARGETS)
+
+mrproper: clean
+
+%.lng:
+	@echo '$(STAGE) No such language: $(@:%.lng=%)'
+
+.PHONY: all mrproper depend clean
diff --git a/Makefile.src.in b/Makefile.src.in
new file mode 100644
index 000000000..1170e6352
--- /dev/null
+++ b/Makefile.src.in
@@ -0,0 +1,263 @@
+# Auto-generated file -- DO NOT EDIT
+
+CC_HOST      = !!CC_HOST!!
+CXX_HOST     = !!CXX_HOST!!
+CC_BUILD     = !!CC_BUILD!!
+WINDRES      = !!WINDRES!!
+STRIP        = !!STRIP!!
+CC_CFLAGS    = !!CC_CFLAGS!!
+CFLAGS       = !!CFLAGS!!
+CFLAGS_BUILD = !!CFLAGS_BUILD!!
+LIBS         = !!LIBS!!
+LDFLAGS      = !!LDFLAGS!!
+BIN_DIR      = !!BIN_DIR!!
+LANG_DIR     = !!LANG_DIR!!
+SRC_OBJS_DIR = !!SRC_OBJS_DIR!!
+LANG_OBJS_DIR= !!LANG_OBJS_DIR!!
+SRC_DIR      = !!SRC_DIR!!
+MEDIA_DIR    = !!MEDIA_DIR!!
+TTD          = !!TTD!!
+STRGEN       = !!STRGEN!!
+ENDIAN_CHECK = !!ENDIAN_CHECK!!
+ENDIAN_FORCE = !!ENDIAN_FORCE!!
+OS           = !!OS!!
+STAGE        = !!STAGE!!
+MAKEDEPEND   = !!MAKEDEPEND!!
+CFLAGS_MAKEDEP= !!CFLAGS_MAKEDEP!!
+SORT         = !!SORT!!
+CONFIG_CACHE_COMPILER = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_COMPILER!!
+CONFIG_CACHE_LINKER   = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_LINKER!!
+CONFIG_CACHE_ENDIAN   = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_ENDIAN!!
+CONFIG_CACHE_SOURCE   = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_SOURCE!!
+CONFIG_CACHE_VERSION  = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_VERSION!!
+
+OBJS_C   := !!OBJS_C!!
+OBJS_CPP := !!OBJS_CPP!!
+OBJS_M   := !!OBJS_M!!
+OBJS_RC  := !!OBJS_RC!!
+OBJS     := $(OBJS_C) $(OBJS_CPP) $(OBJS_M) $(OBJS_RC)
+SRCS     := !!SRCS!!
+
+# All C-files depend on those 3 files
+FILE_DEP := $(CONFIG_CACHE_COMPILER) $(LANG_OBJS_DIR)/table/strings.h endian_target.h
+# Create all dirs and subdirs
+RES      := $(shell mkdir -p $(BIN_DIR) $(sort $(dir $(OBJS))))
+
+# Make sure endian_target.h is reasable as if it was in the src/ dir
+CFLAGS += -I $(SRC_OBJS_DIR) -I $(LANG_OBJS_DIR)
+
+ENDIAN_TARGETS := endian_target.h $(ENDIAN_CHECK)
+
+# Check if we want to show what we are doing
+ifdef VERBOSE
+	Q =
+	E = @true
+else
+	Q = @
+	E = @echo
+endif
+
+# Our default target
+all: $(TTD)
+
+# This are 2 rules that are pointing back to STRGEN stuff.
+#  There is not really a need to have them here, but in case
+#  some weirdo wants to run 'make' in the 'src' dir and expects
+#  the languages to be recompiled, this catches that case and
+#  takes care of it nicely.
+$(LANG_OBJS_DIR)/$(STRGEN):
+	$(MAKE) -C $(LANG_OBJS_DIR) $(STRGEN)
+
+$(LANG_OBJS_DIR)/table/strings.h: $(LANG_DIR)/english.txt $(LANG_OBJS_DIR)/$(STRGEN)
+	$(MAKE) -C $(LANG_OBJS_DIR) table/strings.h
+
+# Make the revision number
+ifdef REVISION
+REV := $(REVISION)
+else
+# Are we a SVN dir?
+ifeq ($(shell if test -d $(SRC_DIR)/.svn; then echo 1; fi), 1)
+# Find if the local source if modified
+REV_MODIFIED := $(shell svnversion $(SRC_DIR) | sed -n 's/.*\(M\).*/\1/p' )
+# Find the revision like: rXXXX-branch
+REV := $(shell LC_ALL=C svn info $(SRC_DIR) | awk '/^URL:.*branch/ { split($$2, a, "/"); BRANCH="-"a[5] } /^Last Changed Rev:/ { REV="r"$$4"$(REV_MODIFIED)" } END { print REV BRANCH }')
+endif
+endif
+# Make sure we have something in REV
+ifeq ($(REV),)
+REV := norev000
+endif
+
+# This helps to recompile if flags change
+RES := $(shell if [ "`cat $(CONFIG_CACHE_COMPILER) 2>/dev/null`" != "$(CC_CFLAGS) $(CFLAGS)" ]; then echo "$(CC_CFLAGS) $(CFLAGS)" > $(CONFIG_CACHE_COMPILER); fi )
+RES := $(shell if [ "`cat $(CONFIG_CACHE_LINKER) 2>/dev/null`" != "$(LDFLAGS) $(LIBS)" ]; then echo "$(LDFLAGS) $(LIBS)" > $(CONFIG_CACHE_LINKER); fi )
+RES := $(shell if [ "`cat $(CONFIG_CACHE_ENDIAN) 2>/dev/null`" != "$(ENDIAN_FORCE)" ]; then echo "$(ENDIAN_FORCE)" > $(CONFIG_CACHE_ENDIAN); fi )
+
+# If there is a change in the source-file-list, make sure we recheck the deps
+RES := $(shell if [ "`cat $(CONFIG_CACHE_SOURCE) 2>/dev/null`" != "$(SRCS)" ]; then echo "$(SRCS)" > $(CONFIG_CACHE_SOURCE); fi )
+# If there is a change in the revision, make sure we recompile rev.c
+RES := $(shell if [ "`cat $(CONFIG_CACHE_VERSION) 2>/dev/null`" != "$(REV)" ]; then echo "$(REV)" > $(CONFIG_CACHE_VERSION); fi )
+
+ifndef MAKEDEPEND
+# The slow, but always correct, dep-check
+DEP_MASK := %.d
+DEPS     := $(OBJS:%.o=%.d)
+
+# Only include the deps if we are compiling everything
+ifeq ($(filter $(ENDIAN_TARGETS) %.o clean mrproper, $(MAKECMDGOALS)),)
+-include $(DEPS)
+else
+# In case we want to compile a single target, include the .d file for it
+ifneq ($(filter %.o, $(MAKECMDGOALS)),)
+SINGLE_DEP := $(filter %.o, $(MAKECMDGOALS))
+-include $(SINGLE_DEP:%.o=%.d)
+endif
+endif
+
+# Find the deps via GCC. Rarely wrong, but a bit slow
+
+$(OBJS_C:%.o=%.d): %.d: $(SRC_DIR)/%.c $(FILE_DEP)
+	$(E) '$(STAGE) DEP $(<:$(SRC_DIR)/%.c=%.c)'
+	$(Q)$(CC_HOST) $(CC_CFLAGS) $(CFLAGS) -MM $< | sed 's#^$(@F:%.d=%.o):#$@ $(@:%.d=%.o):#' > $@
+
+$(OBJS_CPP:%.o=%.d): %.d: $(SRC_DIR)/%.cpp $(FILE_DEP)
+	$(E) '$(STAGE) DEP $(<:$(SRC_DIR)/%.cpp=%.cpp)'
+	$(Q)$(CXX_HOST) $(CFLAGS) -MM $< | sed 's#^$(@F:%.d=%.o):#$@ $(@:%.d=%.o):#' > $@
+
+$(OBJS_M:%.o=%.d): %.d: $(SRC_DIR)/%.m $(FILE_DEP)
+	$(E) '$(STAGE) DEP $(<:$(SRC_DIR)/%.m=%.m)'
+	$(Q)$(CC_HOST) $(CC_CFLAGS) $(CFLAGS) -MM $< | sed 's#^$(@F:%.d=%.o):#$@ $(@:%.d=%.o):#' > $@
+
+else
+# The much faster, but can be wrong, dep-check
+DEP_MASK :=
+DEPS     := Makefile.dep
+
+# Only include the deps if we are not cleaning
+ifeq ($(filter $(ENDIAN_TARGETS) depend clean mrproper, $(MAKECMDGOALS)),)
+-include Makefile.dep
+endif
+
+# Make sure that only 'make depend' ALWAYS triggers a recheck
+ifeq ($(filter depend, $(MAKECMDGOALS)),)
+Makefile.dep: $(FILE_DEP) $(SRCS:%=$(SRC_DIR)/%) $(CONFIG_CACHE_SOURCE)
+else
+Makefile.dep: FORCE
+endif
+	$(E) '$(STAGE) DEP CHECK (all files)'
+	$(Q)rm -f Makefile.dep.tmp
+	$(Q)touch Makefile.dep.tmp
+
+# Calculate the deps via makedepend
+	$(Q)$(MAKEDEPEND) -f$(SRC_OBJS_DIR)/Makefile.dep.tmp -o.o -Y -v -- $(CFLAGS_MAKEDEP) -- $(SRCS:%=$(SRC_DIR)/%) 2>/dev/null
+
+# Convert x:/... paths to /x/... for mingw
+ifeq ($(OS), MINGW)
+	@cat Makefile.dep.tmp | sed 's@\([a-zA-Z]\):/@/\1/@g' > Makefile.dep.tmp.mingw
+	@cp Makefile.dep.tmp.mingw Makefile.dep.tmp
+	@rm -f Makefile.dep.tmp.mingw
+endif
+
+# Remove all comments and includes that don't start with $(SRC_DIR)
+# Remove $(SRC_DIR) from object-file-name
+	@awk '                              \
+	/^# DO NOT/ { print $$0 ; next}     \
+	/^#/ {next}                         \
+	/:/ {                               \
+		left = NF - 1;                    \
+		for (n = 2; n <= NF; n++) {       \
+			if (match($$n, "^$(SRC_DIR)") == 0) { \
+				$$n = "";                     \
+				left--;                       \
+			}                               \
+		}                                 \
+		gsub("$(SRC_DIR)/", "", $$1);     \
+		if (left > 0) {                   \
+			print $$0;                      \
+			$$1 = "Makefile.dep:";          \
+			print $$0;                      \
+		}                                 \
+		next                              \
+	}                                   \
+	{                                   \
+		print $$0                         \
+	}                                   \
+	' < Makefile.dep.tmp | sed 's/  */ /g;s/ $$//' | $(SORT) > Makefile.dep
+
+	$(Q)rm -f Makefile.dep.tmp Makefile.dep.tmp.bak
+
+endif
+
+# Avoid problems with deps if a .h file is deleted without the deps
+#  being updated. Now the Makefile continues, the deps are recreated
+#  and all will be fine.
+%.h:
+	@true
+
+
+# Compile all the files according to the targets
+
+$(OBJS_C): %.o: $(SRC_DIR)/%.c $(DEP_MASK) $(FILE_DEP)
+	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.c=%.c)'
+	$(Q)$(CC_HOST) $(CC_CFLAGS) $(CFLAGS) -c -o $@ $<
+
+$(OBJS_CPP): %.o: $(SRC_DIR)/%.cpp $(DEP_MASK) $(FILE_DEP)
+	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
+	$(Q)$(CXX_HOST) $(CFLAGS) -c -o $@ $<
+
+$(OBJS_M): %.o: $(SRC_DIR)/%.m $(DEP_MASK) $(FILE_DEP)
+	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.m=%.m)'
+	$(Q)$(CC_HOST) $(CC_CFLAGS) $(CFLAGS) -c -o $@ $<
+
+$(OBJS_RC): %.o: $(SRC_DIR)/%.rc $(FILE_DEP)
+	$(E) '$(STAGE) Compiling resource $(<:$(SRC_DIR)/%.rc=%.rc)'
+	$(Q)$(WINDRES) -o $@ -I $(MEDIA_DIR) $<
+
+$(TTD): rev.o $(OBJS) $(CONFIG_CACHE_LINKER)
+	$(E) '$(STAGE) Linking $@'
+	$(Q)$(CXX_HOST) $(LDFLAGS) rev.o $(OBJS) $(LIBS) -o $@ && cp $@ $(BIN_DIR)/
+ifdef STRIP
+	$(Q)$(STRIP) $@
+endif
+
+# The targets to compile the endian-code
+
+endian_target.h: $(ENDIAN_CHECK) $(CONFIG_CACHE_ENDIAN)
+	$(E) '$(STAGE) Testing endianness for target'
+	$(Q)./$(ENDIAN_CHECK) $(ENDIAN_FORCE) > $@
+
+$(ENDIAN_CHECK): $(SRC_DIR)/endian_check.c
+	$(E) '$(STAGE) Compiling and Linking $@'
+	$(Q)$(CC_BUILD) $(CFLAGS_BUILD) $< -o $@
+
+# Revision files
+
+rev.c: $(CONFIG_CACHE_VERSION)
+# setting the revision number in a place, there the binary can read it
+	@echo 'const char _openttd_revision[] = "$(REV)";' > rev.c
+# Some additions for MorphOS versions tag
+ifeq ($(OS),MORPHOS)
+	@echo '#ifdef __MORPHOS__' >> rev.c
+	@echo 'const char morphos_versions_tag[] = "\\0$$VER: OpenTTD $(REV) ('`date +%d.%m.%y`') (C) OpenTTD Team [MorphOS, PowerPC]";' >> rev.c
+	@echo '#endif' >> rev.c
+endif
+
+rev.o: rev.c $(FILE_DEP)
+	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.c=%.c)'
+	$(Q)$(CC_HOST) $(CC_CFLAGS) $(CFLAGS) -c -o $@ $<
+
+FORCE:
+
+depend: $(DEPS)
+
+clean:
+	$(E) '$(STAGE) Cleaning up object files'
+	$(Q)rm -f $(DEPS) $(OBJS) $(TTD) $(TTD:%=$(BIN_DIR)/%) $(CONFIG_CACHE_COMPILER) $(CONFIG_CACHE_LINKER) $(CONFIG_CACHE_ENDIAN) $(CONFIG_CACHE_SOURCE) $(ENDIAN_TARGETS) rev.o
+
+mrproper: clean
+	$(Q)rm -f rev.c
+
+%.o:
+	@echo '$(STAGE) No such source-file: $(@:%.o=%).[c|cpp|m|rc]'
+
+.PHONY: all mrproper depend clean FORCE
diff --git a/data/2ccmap.grf b/bin/data/2ccmap.grf
index 4e833c0e8..4e833c0e8 100644
--- a/data/2ccmap.grf
+++ b/bin/data/2ccmap.grf
diff --git a/data/airports.grf b/bin/data/airports.grf
index 8c35d18d0..8c35d18d0 100644
--- a/data/airports.grf
+++ b/bin/data/airports.grf
diff --git a/data/autorail.grf b/bin/data/autorail.grf
index cd6fd293c..cd6fd293c 100644
--- a/data/autorail.grf
+++ b/bin/data/autorail.grf
diff --git a/data/canalsw.grf b/bin/data/canalsw.grf
index 045eae15e..045eae15e 100644
--- a/data/canalsw.grf
+++ b/bin/data/canalsw.grf
diff --git a/data/dosdummy.grf b/bin/data/dosdummy.grf
index 6524d5971..6524d5971 100644
--- a/data/dosdummy.grf
+++ b/bin/data/dosdummy.grf
diff --git a/data/elrailsw.grf b/bin/data/elrailsw.grf
index f722d1e3a..f722d1e3a 100644
--- a/data/elrailsw.grf
+++ b/bin/data/elrailsw.grf
diff --git a/data/nsignalsw.grf b/bin/data/nsignalsw.grf
index 03dee7863..03dee7863 100644
--- a/data/nsignalsw.grf
+++ b/bin/data/nsignalsw.grf
diff --git a/data/openttd.grf b/bin/data/openttd.grf
index 95ec41dbb..95ec41dbb 100644
--- a/data/openttd.grf
+++ b/bin/data/openttd.grf
diff --git a/data/opntitle.dat b/bin/data/opntitle.dat
index 70caa9ff8..70caa9ff8 100644
--- a/data/opntitle.dat
+++ b/bin/data/opntitle.dat
diff --git a/data/trkfoundw.grf b/bin/data/trkfoundw.grf
index 5fbfa36e9..5fbfa36e9 100644
--- a/data/trkfoundw.grf
+++ b/bin/data/trkfoundw.grf
diff --git a/scenario/README b/bin/scenario/README
index 48e872cc2..48e872cc2 100644
--- a/scenario/README
+++ b/bin/scenario/README
diff --git a/scripts/autoexec.scr.example b/bin/scripts/autoexec.scr.example
index af1b66d21..af1b66d21 100644
--- a/scripts/autoexec.scr.example
+++ b/bin/scripts/autoexec.scr.example
diff --git a/scripts/on_client.scr.example b/bin/scripts/on_client.scr.example
index 5bbd76049..5bbd76049 100644
--- a/scripts/on_client.scr.example
+++ b/bin/scripts/on_client.scr.example
diff --git a/scripts/on_dedicated.scr.example b/bin/scripts/on_dedicated.scr.example
index 5465cd797..5465cd797 100644
--- a/scripts/on_dedicated.scr.example
+++ b/bin/scripts/on_dedicated.scr.example
diff --git a/scripts/on_server.scr.example b/bin/scripts/on_server.scr.example
index cc799d9e7..cc799d9e7 100644
--- a/scripts/on_server.scr.example
+++ b/bin/scripts/on_server.scr.example
diff --git a/scripts/pre_dedicated.scr.example b/bin/scripts/pre_dedicated.scr.example
index b41ca51d2..b41ca51d2 100644
--- a/scripts/pre_dedicated.scr.example
+++ b/bin/scripts/pre_dedicated.scr.example
diff --git a/scripts/pre_server.scr.example b/bin/scripts/pre_server.scr.example
index c1b6c822c..c1b6c822c 100644
--- a/scripts/pre_server.scr.example
+++ b/bin/scripts/pre_server.scr.example
diff --git a/scripts/readme.txt b/bin/scripts/readme.txt
index 2927dcdcb..2927dcdcb 100644
--- a/scripts/readme.txt
+++ b/bin/scripts/readme.txt
diff --git a/config.lib b/config.lib
new file mode 100644
index 000000000..bbbaf0d9f
--- /dev/null
+++ b/config.lib
@@ -0,0 +1,2212 @@
+
+log() {
+	if [ $1 = "1" ]; then echo "$2"; fi
+	echo "$2" >> $config_log
+}
+
+set_default() {
+	ignore_extra_parameters="0"
+	# We set all kinds of defaults for params. Later on the user can override
+	# most of them; but if they don't, this default is used.
+	build=""
+	host=""
+	cc_build=""
+	cc_host=""
+	cxx_host=""
+	windres=""
+	strip=""
+	lipo=""
+	os="DETECT"
+	endian="AUTO"
+	revision=""
+	config_log="config.log"
+	prefix_dir="/usr/local"
+	binary_dir="games"
+	data_dir="share/games/openttd"
+	icon_dir="share/pixmaps"
+	personal_dir=""
+	custom_lang_dir=""
+	second_data_dir=""
+	install_dir="/"
+	enable_install="0"
+	enable_debug="0"
+	enable_profiling="0"
+	enable_dedicated="0"
+	enable_network="1"
+	enable_static="1"
+	enable_translator="0"
+	enable_assert="1"
+	enable_strip="1"
+	enable_universal="1"
+	enable_osx_g5="0"
+	with_osx_sysroot="1"
+	with_application_bundle="1"
+	with_sdl="1"
+	with_cocoa="1"
+	with_zlib="1"
+	with_png="1"
+	with_makedepend="1"
+	with_direct_music="1"
+	with_sort="1"
+	with_iconv="1"
+	with_midi=""
+	with_midi_arg=""
+	with_freetpye="1"
+	with_fontconfig="1"
+
+	save_params_array="build host cc_build cc_host cxx_host windres strip lipo os revision endian config_log prefix_dir binary_dir data_dir icon_dir personal_dir install_dir custom_lang_dir second_data_dir enable_install enable_debug enable_profiling enable_dedicated enable_network enable_static enable_translator enable_assert enable_strip with_osx_sysroot enable_universal enable_osx_g5 with_application_bundle with_sdl with_cocoa with_zlib with_png with_makedepend with_direct_music with_sort with_iconv with_midi with_midi_arg with_freetype with_fontconfig CC CXX CFLAGS LDFLAGS"
+}
+
+detect_params() {
+	# Walk over all params from the user and override any default settings if
+	#  needed. This also handles any invalid option.
+	for p in "$@"
+	do
+		if [ -n "$prev_p" ]
+		then
+			eval "$prev_p=\$p"
+			prev_p=
+			continue
+		fi
+
+		optarg=`expr "x$p" : 'x[^=]*=\(.*\)'`
+
+		case "$p" in
+			--help | -h)
+				showhelp
+				exit 0
+				;;
+
+			--config-log)
+				prev_p="config_log"
+				;;
+			--config-log=*)
+				config_log="$optarg"
+				;;
+
+			--build)
+				prev_p="build"
+				;;
+			--build=*)
+				build="$optarg"
+				;;
+
+			--host)
+				prev_p="host"
+				;;
+			--host=*)
+				host="$optarg"
+				;;
+
+			--os)
+				prev_p="os"
+				;;
+			--os=*)
+				os="$optarg"
+				;;
+
+			--revision=*)
+				revision="$optarg"
+				;;
+
+			--cc-build)
+				prevp_p="cc_build"
+				;;
+			--cc-build=*)
+				cc_build="$optarg"
+				;;
+			--cc-host)
+				prevp_p="cc_host"
+				;;
+			--cc-host=*)
+				cc_host="$optarg"
+				;;
+			--cxx-host)
+				prevp_p="cxx_host"
+				;;
+			--cxx-host=*)
+				cxx_host="$optarg"
+				;;
+			--windres)
+				prevp_p="windres"
+				;;
+			--windres=*)
+				windres="$optarg"
+				;;
+			--strip)
+				prevp_p="strip"
+				;;
+			--strip=*)
+				strip="$optarg"
+				;;
+			--lipo)
+				prevp_p="lipo"
+				;;
+			--lipo=*)
+				lipo="$optarg"
+				;;
+
+			--endian)
+				prev_p="endian"
+				;;
+			--endian=*)
+				endian="$optarg"
+				;;
+
+
+
+			--prefix-dir)
+				prevp_p="prefix-dir"
+				;;
+			--prefix-dir=*)
+				prefix_dir="$optarg"
+				;;
+
+			--binary-dir)
+				prevp_p="binary-dir"
+				;;
+			--binary-dir=*)
+				binary_dir="$optarg"
+				;;
+
+			--data-dir)
+				prevp_p="data-dir"
+				;;
+			--data-dir=*)
+				data_dir="$optarg"
+				;;
+
+			--icon-dir)
+				prevp_p="icon-dir"
+				;;
+			--icon-dir=*)
+				icon_dir="$optarg"
+				;;
+
+			--personal-dir)
+				prevp_p="personal-dir"
+				;;
+			--personal-dir=*)
+				personal_dir="$optarg"
+				;;
+
+			--install-dir)
+				prevp_p="install-dir"
+				;;
+			--install-dir=*)
+				install_dir="$optarg"
+				;;
+
+# TODO: The next few cases will be removed when the search path patch is applied
+			--custom-lang-dir)
+				prevp_p="custom-lang-dir"
+				;;
+			--custom-lang-dir=*)
+				custom_lang_dir="$optarg"
+				;;
+
+			--second-data-dir)
+				prevp_p="second-data-dir"
+				;;
+			--second-data-dir=*)
+				second_data_dir="$optarg"
+				;;
+
+			--enable-install)
+				enable_install="1"
+				;;
+			--enable-install=*)
+				enable_install="$optarg"
+				;;
+# TODO: End of to be removed cases
+
+
+			--enable-debug)
+				enable_debug="1"
+				;;
+			--enable-debug=*)
+				enable_debug="$optarg"
+				;;
+			--enable-profiling)
+				enable_profiling="1"
+				;;
+			--enable-profiling=*)
+				enable_profiling="$optarg"
+				;;
+			--enable-dedicated)
+				enable_dedicated="1"
+				;;
+			--enable-dedicated=*)
+				enable_dedicated="$optarg"
+				;;
+			--enable-network=*)
+				enable_network="$optarg"
+				;;
+			--disable-network)
+				enable_network="0"
+				;;
+			--disable-static)
+				enable_static="0"
+				;;
+			--enable-static)
+				enable_static="2"
+				;;
+			--enable-static=*)
+				enable_static="$optarg"
+				;;
+			--disable-translator)
+				enable_translator="0"
+				;;
+			--enable-translator)
+				enable_translator="2"
+				;;
+			--enable-translator=*)
+				enable_translator="$optarg"
+				;;
+			--disable-assert)
+				enable_assert="0"
+				;;
+			--enable-assert)
+				enable_assert="2"
+				;;
+			--enable-assert=*)
+				enable_assert="$optarg"
+				;;
+			--disable-strip)
+				enable_strip="0"
+				;;
+			--enable-strip)
+				enable_strip="2"
+				;;
+			--enable-strip=*)
+				enable_strip="$optarg"
+				;;
+			--disable-universal)
+				enable_universal="0"
+				;;
+			--enable-universal)
+				enable_universal="2"
+				;;
+			--enable-universal=*)
+				enable_universal="$optarg"
+				;;
+			--disable-osx-g5)
+				enable_osx_g5="0"
+				;;
+			--enable-osx-g5)
+				enable_osx_g5="2"
+				;;
+			--enable-osx-g5=*)
+				enable_osx_g5="$optarg"
+				;;
+
+			--with-sdl)
+				with_sdl="2"
+				;;
+			--without-sdl)
+				with_sdl="0"
+				;;
+			--with-sdl=*)
+				with_sdl="$optarg"
+				;;
+
+			--with-cocoa)
+				with_cocoa="2"
+				;;
+			--without-cocoa)
+				with_cocoa="0"
+				;;
+			--with-cocoa=*)
+				with_cocoa="$optarg"
+				;;
+
+			--with-zlib)
+				with_zlib="2"
+				;;
+			--without-zlib)
+				with_zlib="0"
+				;;
+			--with-zlib=*)
+				with_zlib="$optarg"
+				;;
+
+			--with-png)
+				with_png="2"
+				;;
+			--without-png)
+				with_png="0"
+				;;
+			--with-png=*)
+				with_png="$optarg"
+				;;
+			--with-libpng)
+				with_png="2"
+				;;
+			--without-libpng)
+				with_png="0"
+				;;
+			--with-libpng=*)
+				with_png="$optarg"
+				;;
+
+			--with-freetype)
+				with_freetype="2"
+				;;
+			--without-freetype)
+				with_freetype="0"
+				;;
+			--with-freetype=*)
+				with_freetype="$optarg"
+				;;
+			--with-libfreetype)
+				with_freetype="2"
+				;;
+			--without-libfreetype)
+				with_freetype="0"
+				;;
+			--with-libfreetype=*)
+				with_freetype="$optarg"
+				;;
+
+			--with-fontconfig)
+				with_fontconfig="2"
+				;;
+			--without-fontconfig)
+				with_fontconfig="0"
+				;;
+			--with-fontconfig=*)
+				with_fontconfig="$optarg"
+				;;
+			--with-libfontconfig)
+				with_fontconfig="2"
+				;;
+			--without-libfontconfig)
+				with_fontconfig="0"
+				;;
+			--with-libfontconfig=*)
+				with_fontconfig="$optarg"
+				;;
+
+			--with-makedepend)
+				with_makedepend="2"
+				;;
+			--without-makedepend)
+				with_makedepend="0"
+				;;
+			--with-makedepend=*)
+				with_makedepend="$optarg"
+				;;
+
+			--with-direct-music)
+				with_direct_music="2"
+				;;
+			--without-direct-music)
+				with_direct_music="0"
+				;;
+			--with-direct-music=*)
+				with_direct_music="$optarg"
+				;;
+
+			--with-sort)
+				with_sort="2"
+				;;
+			--without-sort)
+				with_sort="0"
+				;;
+			--with-sort=*)
+				with_sort="$optarg"
+				;;
+
+			--with-iconv)
+				with_iconv="2"
+				;;
+			--without-iconv)
+				with_iconv="0"
+				;;
+			--with-iconv=*)
+				with_iconv="$optarg"
+				;;
+
+			--with-midi=*)
+				with_midi="$optarg"
+				;;
+			--with-midi-arg=*)
+				with_midi_arg="$optarg"
+				;;
+
+			--without-osx-sysroot)
+				with_osx_sysroot="0"
+				;;
+			--with-osx-sysroot)
+				with_osx_sysroot="2"
+				;;
+			--with-osx-sysroot=*)
+				with_osx_sysroot="$optarg"
+				;;
+
+			--without-application-bundle)
+				with_applicant_bundle="0"
+				;;
+			--with-application-bundle)
+				with_applicant_bundle="1"
+				;;
+			--with-application-bundle=*)
+				with_applicant_bundle="$optarg"
+				;;
+
+			CC=* | --CC=*)
+				CC="$optarg"
+				;;
+			CXX=* | --CXX=*)
+				CXX="$optarg"
+				;;
+			CFLAGS=* | --CFLAGS=*)
+				CFLAGS="$optarg"
+				;;
+			LDFLAGS=* | --LDFLAGS=*)
+				LDFLAGS="$optarg"
+				;;
+
+			--ignore-extra-parameters)
+				ignore_extra_parameters="1"
+				;;
+
+			--*)
+				if [ "$ignore_extra_parameters" = "0" ]
+				then
+					echo "Unknown option $p"
+					exit 1
+				else
+					echo "Unknown option $p ignored"
+				fi
+				;;
+		esac
+	done
+
+	if [ -n "$prev_p" ]
+	then
+		echo "configure: error: missing argument to --$prev_p"
+		exit 1
+	fi
+
+	# Clean the logfile
+	echo "" > $config_log
+}
+
+save_params() {
+	# Here we save all params, so we can later on do an exact redo of this
+	#  configuration, without having the user to re-input stuff
+
+	echo "Running configure with following options:" >> $config_log
+	echo "" >> $config_log
+
+	configure="$0 --ignore-extra-parameters"
+	for p in $save_params_array
+	do
+		eval "v=\$$p"
+		p=`echo "$p" | sed 's/_/-/g;s/\n//g;'`
+		# Only save those params that aren't empty
+		configure="$configure --$p=$v"
+	done
+
+	echo "$configure" >> $config_log
+	echo "$configure" > config.cache
+	echo "" >> $config_log
+}
+
+check_params() {
+	# Some params want to be in full uppercase, else they might not work as
+	# expected.. fix that here
+
+	endian=`echo $endian | tr [:lower:] [:upper:]`
+	os=`echo $os | tr [:lower:] [:upper:]`
+
+	# Check if all params have valid values
+
+	# Endian only allows AUTO, LE and, BE
+	if ! echo $endian | grep -q "^AUTO$\|^LE$\|^BE$"
+	then
+		echo "configure: error: invalid option --endian=$endian"
+		echo " Available options are: --endian=[AUTO|LE|BE]"
+		exit 1
+	fi
+	# OS only allows DETECT, UNIX, OSX, FREEBSD, MORPHOS, BEOS, SUNOS, CYGWIN, and MINGW, OS2
+	if ! echo $os | grep -q "^DETECT$\|^UNIX$\|^OSX$\|^FREEBSD$\|^MORPHOS$\|^BEOS$\|^SUNOS$\|^CYGWIN$\|^MINGW$\|^OS2"
+	then
+		echo "configure: error: invalid option --os=$os"
+		echo " Available options are: --os=[DETECT|UNIX|OSX|FREEBSD|MORPHOS|BEOS|SUNOS|CYGWIN|MINGW|OS2]"
+		exit 1
+	fi
+	# enable_debug should be between 0 and 4
+	if ! echo $enable_debug | grep -q "^0$\|^1$\|^2$\|^3$"
+	then
+		echo "configure: error: invalid option --enable-debug=$enable_debug"
+		echo " Available options are: --enable-debug[=0123]"
+		exit 1
+	fi
+
+	check_build
+	check_host
+
+	detect_os
+
+# We might enable universal builds always on OSX targets.. but currently we don't
+#	if [ "$enable_universal" = "1" ]  && [ "$os" != "OSX" ]
+	if [ "$enable_universal" = "1" ]
+	then
+		enable_universal="0"
+	fi
+	if [ "$enable_universal" = "2" ]  && [ "$os" != "OSX" ]
+	then
+		log 1 "configure: error: --enable-universal only works on OSX"
+		exit 1
+	fi
+	if [ "$enable_universal" = "0" ]
+	then
+		log 1 "checking universal build... no"
+	else
+		log 1 "checking universal build... yes"
+	fi
+
+	# Already detected by check_build
+	log 1 "checking for build gcc... $cc_build"
+	log 1 "checking for host gcc... $cc_host"
+
+	check_cxx
+	check_windres
+	check_strip
+	check_lipo
+	check_makedepend
+
+	if [ "$enable_static" = "1" ]
+	then
+		if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "MORPHOS" ] || [ "$os" = "OSX" ]
+		then
+			enable_static="2"
+		else
+			enable_static="0"
+		fi
+	fi
+
+	if [ "$enable_static" != "0" ]
+	then
+		log 1 "checking for static... yes"
+
+		if [ "$os" != "MINGW" ] && [ "$os" != "CYGWIN" ] && [ "$os" != "OSX" ] && [ "$os" != "MORPHOS" ]
+		then
+			log 1 "WARNING: static is only known to work on Windows, MacOSX and MorphOS"
+			log 1 "WARNING: use static at your own risk on this platform"
+
+			sleep 5
+		fi
+	else
+		log 1 "checking for static... no"
+	fi
+
+	# Show what we configured
+	if [ "$enable_debug" = "0" ]
+	then
+		log 1 "using debug level... no"
+	elif [ "$enable_profiling" != "0" ]
+	then
+		log 1 "using debug level... profiling (debug level $enable_debug)"
+	else
+		log 1 "using debug level... level $enable_debug"
+	fi
+
+	detect_sdl
+	detect_cocoa
+
+	if [ "$enable_dedicated" != "0" ]
+	then
+		log 1 "checking GDI video driver... skipping"
+		log 1 "checking dedicated... found"
+
+		if [ "$enable_network" != "0" ]
+		then
+			log 1 "WARNING: compiling a dedicated server without network is pointless"
+			sleep 5
+		fi
+	else
+		if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ]
+		then
+			log 1 "checking GDI video driver... found"
+		else
+			log 1 "checking GDI video driver... not Windows, skipping"
+		fi
+
+		if [ -z "$sdl_config" ] && [ "$with_cocoa" = 0 ] && [ "$os" != "MINGW" ] && [ "$os" != "CYGWIN" ]
+		then
+			log 1 "WARNING: no video driver found, building dedicated only"
+			enable_dedicated="1"
+			sleep 1
+
+			log 1 "checking dedicated... found"
+		else
+			log 1 "checking dedicated... not selected"
+		fi
+	fi
+
+	if [ "$enable_network" != "0" ]
+	then
+		log 1 "checking network... found"
+	else
+		log 1 "checking network... disabled"
+	fi
+
+	if [ "$enable_translator" != "0" ]
+	then
+		log 1 "checking translator... debug"
+		strgen_flags=""
+	else
+		log 1 "checking translator... no"
+		# -t shows TODO items, normally they are muted
+		strgen_flags="-t"
+	fi
+
+	if [ "$enable_assert" != "0" ]
+	then
+		log 1 "checking assert... enabled"
+	else
+		log 1 "checking assert... disabled"
+	fi
+
+	detect_zlib
+	detect_png
+	detect_freetype
+	detect_fontconfig
+	detect_iconv
+
+	if [ "$with_direct_music" = "1" ] || [ "$with_direct_music" = "2" ]
+	then
+		if [ "$os" != "MINGW" ] && [ "$os" != "CYGWIN" ]
+		then
+			if [ "$with_direct_music" = "2" ]
+			then
+				log 1 "configure: error: direct-music is only supported on Win32 targets"
+				exit 1
+			fi
+			with_direct_music="0"
+
+			log 1 "checking direct-music... not Windows, skipping"
+		else
+			check_direct_music
+		fi
+	fi
+
+	detect_sort
+
+	if [ "$os" = "OSX" ] && [ "$endian" = "AUTO" ]
+	then
+		endian="PREPROCESSOR"
+	fi
+
+	log 1 "checking endianess... $endian"
+
+	# Suppress language errors when there is a version defined, indicating a release
+	#  It just isn't pretty if any release produces warnings in the languages.
+	if [ -f "$ROOT_DIR/version" ]
+	then
+		lang_suppress="yes"
+		log 1 "suppress language errors... yes"
+	else
+		lang_suppress=""
+		log 1 "suppress language errors... no"
+	fi
+
+	if [ "$enable_debug" = "0" ] && [ "$enable_profiling" = "0" ] && [ "$enable_strip" != "0" ]
+	then
+		if [ "$os" = "MORPHOS" ]
+		then
+			strip_arg="--strip-all --strip-unneeded --remove-section .comment"
+		elif [ "$os" = "OSX" ]
+		then
+			strip_arg=""
+		else
+			strip_arg="-s"
+		fi
+
+		log 1 "checking stripping... $strip $strip_arg"
+	else
+		strip=""
+		log 1 "checking stripping... skipped"
+	fi
+
+	if [ "$os" != "OSX" ] && [ "$with_osx_sysroot" != "0" ]
+	then
+		if [ "$with_osx_sysroot" = "1" ]
+		then
+			with_osx_sysroot="0"
+
+			log 1 "checking OSX sysroot... not OSX, skipping"
+		else
+			log 1 "configure: error: --with-osx-sysroot only works if OSX is the target"
+			exit 1
+		fi
+	fi
+
+	if [ "$with_osx_sysroot" != "0" ]
+	then
+		if [ "$enable_universal" = "0" ] && [ "$with_osx_sysroot" != "1" ] && [ "$with_osx_sysroot" != "2" ]
+		then
+			log 1 "checking OSX sysroot... $with_osx_sysroot"
+		else
+			# If autodetect and no universal, use system default
+			if [ "$with_osx_sysroot" = "1" ] && [ "$enable_universal" = "0" ]
+			then
+				log 1 "checking OSX sysroot... no (use system default)"
+				with_osx_sysroot="0"
+			else
+				log 1 "checking OSX sysroot... automaticly"
+				with_osx_sysroot="3"
+			fi
+		fi
+	else
+		if [ "$os" = "OSX" ]
+		then
+			log 1 "checking OSX sysroot... no (use system default)"
+		fi
+	fi
+
+	if [ "$os" != "OSX" ] && [ "$with_application_bundle" != "0" ]
+	then
+		if [ "$with_application_bundle" = "1" ]
+		then
+			with_application_bundle="0"
+
+			log 1 "checking OSX application bundle... not OSX, skipping"
+		else
+			log 1 "configure: error: --with-application-bundle only works if OSX is the target"
+			exit 1
+		fi
+	fi
+
+	if [ "$os" = "OSX" ] && [ "$with_application_bundle" = "1" ]
+	then
+		OSXAPP="OpenTTD.app"
+
+# TODO: remove next few lines of code when the search path patch has been applied
+		if [ -n "$custom_lang_dir" ] && [ "$custom_lang_dir" != "$(OSXAPP)/Contents/Lang/" ]
+		then
+			log 1 "configure: error: --custom-lang-dir and --with-application-bundle are not compatible
+			exit 1
+		fi
+
+		if [ -n "$custom_lang_dir" ] && [ "$second_data_dir" != "$(OSXAPP)/Contents/Data/" ]
+		then
+			log 1 "configure: error: --second-data-dir and --with-application-bundle are not compatible
+			exit 1
+		fi
+
+		custom_lang_dir="${OSXAPP}/Contents/Lang/"
+		second_data_dir="${OSXAPP}/Contents/Data/"
+# TODO: remove till here
+	else
+		OSXAPP=""
+	fi
+
+	if [ "$os" = "OSX" ]
+	then
+		# Test on G5
+
+		if [ "$enable_osx_g5" != "0" ]
+		then
+			log 1 "detecting G5... yes (forced)"
+		else
+			# First, are we a real OSX system, else we can't detect it
+			native=`LC_ALL=C uname | tr [:upper:] [:lower:] | grep darwin`
+			# If $host doesn't match $build , we are cross-compiling
+			if [ -n "$native" ] && [ "$build" != "$host" ]
+			then
+				$cc_build $SRC_DIR/os/macosx/G5_detector.c -o G5_detector
+				res=`./G5_detector`
+				rm -f G5_detector
+				if [ -n "$res" ]
+				then
+					# This is G5, add flags for it
+					enable_osx_g5="2"
+
+					log 1 "detecting G5... yes"
+				else
+					enable_osx_g5="0"
+
+					log 1 "detecting G5... no"
+				fi
+			else
+				enable_osx_g5="0"
+
+				log 1 "detecting G5... no (cross-compiling)"
+			fi
+		fi
+	else
+		if [ "$enable_osx_g5" != "0" ]
+		then
+			log 1 "configure: error: OSX G5 selected, but not compiling for OSX"
+			log 1 "configure: error: either select OSX as OS, or deselect OSX G5"
+
+			exit 1
+		fi
+	fi
+}
+
+make_cflags_and_ldflags() {
+	# General CFlags for BUILD
+	CFLAGS_BUILD=""
+	# General CFlags for HOST
+	CFLAGS="$CFLAGS -D$os -DWITH_REV"
+	# CFlags for HOST and C-Compiler
+	CC_FLAGS=""
+	# Libs to compile. In fact this is just LDFLAGS
+	LIBS="-lstdc++"
+	# LDFLAGS used for HOST
+	LDFLAGS="$LDFLAGS"
+
+	# Each debug level reduces the optimalization by a bit
+	if [ $enable_debug -ge 1 ]
+	then
+		CFLAGS="$CFLAGS -g -D_DEBUG"
+		OBJS_SUBDIR="debug"
+	else
+		OBJS_SUBDIR="release"
+	fi
+	if [ $enable_debug -ge 2 ]
+	then
+		CFLAGS="$CFLAGS -fno-inline"
+	fi
+	if [ $enable_debug -ge 3 ]
+	then
+		CFLAGS="$CFLAGS -O0"
+	fi
+	if [ $enable_debug = 0 ]
+	then
+		# No debug, add default stuff
+		if [ "$os" = "OSX" ]
+		then
+			# these compilerflags makes the app run as fast as possible without making the app unstable. It works on G3 or newer
+			CFLAGS="$CFLAGS -O3 -funroll-loops -fsched-interblock -falign-loops=16 -falign-jumps=16 -falign-functions=16 -falign-jumps-max-skip=15 -falign-loops-max-skip=15 -mdynamic-no-pic"
+		else
+			if [ "$os" = "MORPHOS" ]
+			then
+				CFLAGS="$CFLAGS -I/gg/os-include -noixemul -fstrict-aliasing -fexpensive-optimizations"
+				CFLAGS="$CFLAGS -mcpu=604 -fno-inline -mstring -mmultiple"
+			fi
+
+			CFLAGS="$CFLAGS -O2 -fomit-frame-pointer"
+		fi
+
+		if [ "$enable_profiling" != "0" ]
+		then
+			CFLAGS="$CFLAGS -pg"
+			LDFLAGS="$LDFLAGS -pg"
+		fi
+	else
+		if [ "$enable_profiling" != "0" ]
+		then
+			CFLAGS="$CFLAGS -p"
+			LDFLAGS="$LDFLAGS -pg"
+		fi
+	fi
+
+	# Enable some things only for certain GCC versions
+	cc_version=`$cc_host -dumpversion | cut -c 1,3`
+
+	if [ $cc_version -ge 29 ]
+	then
+		CFLAGS="$CFLAGS -O -Wall -Wno-multichar -Wsign-compare -Wundef"
+		CFLAGS="$CFLAGS -Wwrite-strings -Wpointer-arith"
+
+		CC_CFLAGS="$CC_CFLAGS -Wstrict-prototypes"
+	fi
+
+	if [ $cc_version -ge 30 ]
+	then
+		CFLAGS="$CFLAGS -W -Wno-unused-parameter"
+	fi
+
+	if [ $cc_version -ge 34 ]
+	then
+		CC_CFLAGS="$CC_CFLAGS -Wdeclaration-after-statement -Wold-style-definition"
+	fi
+
+	if [ "$os" = "CYGWIN" ]
+	then
+		CFLAGS="$CFLAGS -mwin32"
+		LDFLAGS="$LDFLAGS -mwin32"
+	fi
+	if [ "$os" = "MINGW" ]
+	then
+		CFLAGS="$CFLAGS -mno-cygwin"
+		LDFLAGS="$LDFLAGS -mno-cygwin"
+	fi
+
+	if [ "$os" = "CYGWIN" ] || [ "$os" = "MINGW" ]
+	then
+		LDFLAGS="$LDFLAGS -Wl,--subsystem,windows"
+		LIBS="$LIBS -lws2_32 -lwinmm -lgdi32 -ldxguid -lole32"
+	fi
+
+	if [ "$os" != "CYGWIN" ] && [ "$os" != "MINGW" ] && [ "$os" != "MORPHOS" ] && [ "$os" != "OSX" ]
+	then
+		LIBS="$LIBS -lpthread"
+		LIBS="$LIBS -lrt"
+	fi
+
+	if [ "$os" != "MINGW" ]
+	then
+		LIBS="$LIBS -lc"
+	fi
+
+	if [ "$os" = "MORPHOS" ]
+	then
+		# -Wstrict-prototypes generates much noise because of system headers
+		CFLAGS="$CFLAGS -Wno-strict-prototypes"
+	fi
+
+	if [ "$os" = "OSX" ]
+	then
+		LDFLAGS="$LDFLAGS -framework Cocoa"
+		if [ "$enable_dedicated" = "0" ]
+		then
+			LIBS="$LIBS -framework QuickTime"
+		fi
+	fi
+
+	if [ "$os" = "BEOS" ]
+	then
+		LIBS="$LIBS -lmidi -lbe"
+	fi
+
+	# Most targets act like UNIX, just with some additions
+	if [ "$os" = "BEOS" ] || [ "$os" = "OSX" ] || [ "$os" = "MORPHOS" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "SUNOS" ] || [ "$os" = "OS2" ]
+	then
+		CFLAGS="$CFLAGS -DUNIX"
+	fi
+	# And others like Windows
+	if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ]
+	then
+		CFLAGS="$CFLAGS -DWIN"
+	fi
+
+	if [ -n "$sdl_config" ]
+	then
+		CFLAGS="$CFLAGS -DWITH_SDL"
+		CFLAGS="$CFLAGS `$sdl_config --cflags`"
+		if [ "$enable_static" != "0" ]
+		then
+			LIBS="$LIBS `$sdl_config --static-libs`"
+		else
+			LIBS="$LIBS `$sdl_config --libs`"
+		fi
+	fi
+
+	if [ "$with_cocoa" != "0" ]
+	then
+		CFLAGS="$CFLAGS -DWITH_COCOA"
+		LIBS="$LIBS -F/System/Library/Frameworks -framework Cocoa -framework Carbon -framework AudioUnit"
+	fi
+
+	if [ "$with_zlib" != "0" ]
+	then
+		if [ "$enable_static" != "0" ] && [ "$os" != "OSX" ]
+		then
+			LIBS="$LIBS $zlib"
+		else
+			LIBS="$LIBS -lz"
+		fi
+		CFLAGS="$CFLAGS -DWITH_ZLIB"
+	fi
+
+	if [ -n "$png_config" ]
+	then
+		CFLAGS="$CFLAGS -DWITH_PNG"
+		CFLAGS="$CFLAGS `$png_config --cppflags --I_opts | tr '\n\r' '  '`"
+
+		# The extra flags are unneeded for latest libpng-config, but some versions are so broken...
+		if [ "$enable_static" != "0" ]
+		then
+			if [ "$os" = "OSX" ]
+			then
+				LIBS="$LIBS `$png_config --prefix`/lib/libpng.a"
+			else
+				LIBS="$LIBS `$png_config --static --ldflags --libs --L_opts | tr '\n\r' '  '`"
+			fi
+		else
+			LIBS="$LIBS `$png_config --ldflags --libs --L_opts | tr '\n\r' '  '`"
+		fi
+	fi
+
+	if [ -n "$freetype_config" ]
+	then
+		CFLAGS="$CFLAGS -DWITH_FREETYPE"
+		CFLAGS="$CFLAGS `$freetype_config --cflags | tr '\n\r' '  '`"
+
+		if [ "$enable_static" != "0" ]
+		then
+			if [ "$os" = "OSX" ]
+			then
+				LIBS="$LIBS `$freetype_config --prefix`/lib/libfreetype.a"
+			else
+				# Is it possible to do static with freetype, if so: how?
+				LIBS="$LIBS `$freetype_config --libs | tr '\n\r' '  '`"
+			fi
+		else
+			LIBS="$LIBS `$freetype_config --libs | tr '\n\r' '  '`"
+		fi
+	fi
+
+	if [ -n "$fontconfig_config" ]
+	then
+		CFLAGS="$CFLAGS -DWITH_FONTCONFIG"
+		CFLAGS="$CFLAGS `$fontconfig_config --cflags | tr '\n\r' '  '`"
+
+		if [ "$enable_static" != "0" ]
+		then
+			if [ "$os" = "OSX" ]
+			then
+				LIBS="$LIBS `$fontconfig_config --prefix`/lib/libfontconfig.a"
+			else
+				LIBS="$LIBS `$fontconfig_config --libs --static | tr '\n\r' '  '`"
+			fi
+		else
+			LIBS="$LIBS `$fontconfig_config --libs | tr '\n\r' '  '`"
+		fi
+	fi
+
+	if [ "$with_direct_music" != "0" ]
+	then
+		CFLAGS="$CFLAGS -DWIN32_ENABLE_DIRECTMUSIC_SUPPORT"
+	fi
+
+	if [ "$with_iconv" != "0" ]
+	then
+		CFLAGS="$CFLAGS -DWITH_ICONV"
+		LIBS="$LIBS -liconv"
+		if [ "$with_iconv" != "2" ]
+		then
+			CFLAGS="$CFLAGS -I$with_iconv/include"
+			LIBS="$LIBS -L$with_iconv/lib"
+		fi
+	fi
+
+	if [ -n "$with_midi" ]
+	then
+		CFLAGS="$CFLAGS -DEXTERNAL_PLAYER=\"$with_midi\""
+	fi
+	if [ -n "$with_midi_arg" ]
+	then
+		CFLAGS="$CFLAGS -DMIDI_ARG=\"$with_midi_arg\""
+	fi
+
+	if [ "$enable_dedicated" != "0" ]
+	then
+		CFLAGS="$CFLAGS -DDEDICATED"
+	fi
+
+	if [ "$enable_network" != "0" ]
+	then
+		CFLAGS="$CFLAGS -DENABLE_NETWORK"
+
+		if [ "$os" = "BEOS" ]
+		then
+			LDFLAGS="$LDFLAGS -lbind -lsocket"
+		fi
+
+		if [ "$os" = "SUNOS" ]
+		then
+			LDFLAGS="$LDFLAGS -lnsl -lsocket"
+		fi
+	fi
+
+	if [ "$enable_static" != "0" ]
+	then
+		# OSX can't handle -static in LDFLAGS
+		if [ "$os" != "OSX" ]
+		then
+			LDFLAGS="$LDFLAGS -static"
+		fi
+	fi
+
+	if [ "$enable_assert" = "0" ]
+	then
+		CFLAGS="$CFLAGS -DNDEBUG"
+	fi
+
+	if [ "$enable_osx_g5" != "0" ]
+	then
+		CFLAGS="$CFLAGS -mtune=970 -mcpu=970 -mpowerpc-gpopt"
+	fi
+
+	if [ "$with_osx_sysroot" != "0" ] && [ "$with_osx_sysroot" != "3" ]
+	then
+		CFLAGS="$CFLAGS -isysroot /Developer/SDKs/MacOSX$with_osx_sysroot.sdk"
+		LDFLAGS="$LDFLAGS -Wl,-syslibroot,/Developer/SDKs/MacOSX$with_osx_sysroot.sdk"
+	fi
+
+# TODO: remove next few lines of code when the search path patch has been applied
+	if [ -n "$second_data_dir" ]
+	then
+		CFLAGS="$CFLAGS -DSECOND_DATA_DIR=\\\\\"$second_data_dir\\\\\""
+	fi
+
+	if [ -n "$custom_lang_dir" ]
+	then
+		CFLAGS="$CFLAGS -DCUSTOM_LANG_DIR=\\\\\"$custom_lang_dir\\\\\""
+	fi
+# TODO: remove till here
+
+	if [ "$enable_install" = "1" ]
+	then
+		if [ -n "$personal_dir" ]
+		then
+			CFLAGS="$CFLAGS -DUSE_HOMEDIR=1 -DPERSONAL_DIR=\\\\\"$personal_dir/\\\\\""
+		fi
+
+		if [ -n "$data_dir" ]
+		then
+			CFLAGS="$CFLAGS -DGAME_DATA_DIR=\\\\\"$prefix_dir/$data_dir/\\\\\""
+		fi
+
+		if [ -n "$icon_dir" ]
+		then
+			CFLAGS="$CFLAGS -DICON_DIR=\\\\\"$prefix_dir/$icon_dir/\\\\\""
+		fi
+	fi
+
+	if [ -n "$revision" ]
+	then
+		log 1 "checking revision... $revision"
+		log 1 "WARNING: we do not advise you to use this setting"
+		log 1 "WARNING: in most cases it is not safe for network use"
+		log 1 "WARNING: USE WITH CAUTION!"
+
+		sleep 5
+	elif [ -f "$ROOT_DIR/version" ]
+	then
+		revision="`cat $ROOT_DIR/version`"
+
+		log 1 "checking revision... $revision"
+	else
+		revision=""
+
+		log 1 "checking revision... svn detection"
+	fi
+
+	log 1 "using CFLAGS... $CFLAGS $CC_CFLAGS"
+	log 1 "using LDFLAGS... $LIBS $LDFLAGS"
+
+	# Makedepend doesn't like something like: -isysroot /OSX/blabla
+	#  so convert it to: -isysroot -OSX/blabla. makedepend just ignores
+	#  any - command it doesn't know, so we are pretty save.
+	# Lovely hackish, not?
+	# Btw, this almost always comes from outside the configure, so it is
+	#  not something we can control.
+	if [ "$with_makedepend" != "0" ]
+	then
+		cflags_makedep="` echo "$CFLAGS" | sed 's# /# -#g'`"
+	else
+		makedepend=""
+	fi
+}
+
+check_compiler() {
+	# Params:
+	# $1 - Type for message (build / host)
+	# $2 - What to fill with the found compiler
+	# $3 - System to try
+	# $4 - Compiler to try
+	# $5 - Env-setting to try
+	# $6 - GCC alike to try
+	# $7 - CC alike to try
+	# $8 - "0" gcc, "1" g++, "2" windres, "3" strip, "4" lipo
+	# $9 - What the command is to check for
+
+	if [ -n "$3" ]
+	then
+		# Check for system
+		machine=`$3-$6 $9 2>/dev/null`
+		ret=$?
+		eval "$2=$3-$6"
+
+		log 2 "executing $3-$6 $9"
+		log 2 "  returned $machine"
+		log 2 "  exit code $ret"
+
+		if ( [ -z "$machine" ] && [ "$8" != "3" ] ) || [ "$ret" != "0" ]
+		then
+			log 1 "checking $1... $3-$6 not found"
+			log 1 "I couldn't detect any $6 binary for $3"
+			exit 1
+		fi
+
+		if [ "$machine" != "$3" ] && ( [ "$8" = "0" ] || [ "$8" = "1" ] )
+		then
+			log 1 "checking $1... expected $3, found $machine"
+			log 1 "the compiler suggests it doesn't build code for the machine you specified"
+			exit 1
+		fi
+	elif [ -n "$4" ]
+	then
+		# Check for manual compiler
+		machine=`$4 $9 2>/dev/null`
+		ret=$?
+		eval "$2=$4"
+
+		log 2 "executing $4 $9"
+		log 2 "  returned $machine"
+		log 2 "  exit code $ret"
+
+		if ( [ -z "$machine" ] && [ "$8" != "3" ] ) || [ "$ret" != "0" ]
+		then
+			log 1 "checking $1... $4 not found"
+			log 1 "the selected binary doesn't seem to be a $6 binary"
+			exit 1
+		fi
+	else
+		# Nothing given, autodetect
+
+		if [ -n "$5" ]
+		then
+			machine=`$5 $9 2>/dev/null`
+			ret=$?
+			eval "$2=$5"
+
+			log 2 "executing $5 $9"
+			log 2 "  returned $machine"
+			log 2 "  exit code $ret"
+
+			# The user defined a GCC that doesn't reply to $9.. abort
+			if ( [ -z "$machine" ] && [ "$8" != "3" ] ) || [ "$ret" != "0" ]
+			then
+				log 1 "checking $1... $5 unusable"
+				log 1 "the CC environment variable is set, but it doesn't seem to be a $6 binary"
+				log 1 "please redefine the CC/CXX environment to a $6 binary"
+				exit 1
+			fi
+		else
+			log 2 "checking $1... CC/CXX not set (skipping)"
+
+			# No $5, so try '$6'
+			machine=`$6 $9 2>/dev/null`
+			ret=$?
+			eval "$2=$6"
+
+			log 2 "executing $6 $9"
+			log 2 "  returned $machine"
+			log 2 "  exit code $ret"
+
+			if ( [ -z "$machine" ] && [ "$8" != "3" ] ) || [ "$ret" != "0" ]
+			then
+				# Maybe '$7'?
+				machine=`$7 $9 2>/dev/null`
+				ret=$?
+				eval "$2=$7"
+
+				log 2 "executing $7 $9"
+				log 2 "  returned $machine"
+				log 2 "  exit code $ret"
+
+				# All failed, abort
+				if [ -z "$machine" ]
+				then
+					log 1 "checking $1... $6 not found"
+					log 1 "I couldn't detect any $6 binary on your system"
+					log 1 "please define the CC/CXX environment to where it is located"
+
+					exit 1
+				fi
+			fi
+		fi
+	fi
+
+	if [ "$8" != "0" ]
+	then
+		eval "res=\$$2"
+		log 1 "checking $1... $res"
+	else
+		log 1 "checking $1... $machine"
+	fi
+}
+
+check_build() {
+	check_compiler "build system type" "cc_build" "$build" "$cc_build" "$CC" "gcc" "cc" "0" "-dumpmachine"
+}
+
+check_host() {
+	# By default the host is the build
+	if [ -z "$host" ]; then host="$build"; fi
+	check_compiler "host system type" "cc_host" "$host" "$cc_host" "$CC" "gcc" "cc" "0" "-dumpmachine"
+}
+
+check_cxx() {
+	check_compiler "host g++" "cxx_host" "$host" "$cxx_host" "$CXX" "g++" "c++" 1 "-dumpmachine"
+}
+
+check_windres() {
+	if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ]
+	then
+		check_compiler "host windres" "windres" "$host" "$windres" "$WINDRES" "windres" "windres" "2" "-V"
+	fi
+}
+
+check_strip() {
+	if [ "$os" = "OSX" ]
+	then
+		# Most targets have -V in strip, to see if they exists... OSX doesn't.. so execute something
+		echo "int main(int argc, char *argv[]) { }" > strip.test.c
+		$cc_host strip.test.c -o strip.test
+		check_compiler "host strip" "strip" "$host" "$strip" "$STRIP" "strip" "strip" "3" "strip.test"
+		rm -f strip.test.c strip.test
+	else
+		check_compiler "host strip" "strip" "$host" "$strip" "$STRIP" "strip" "strip" "3" "-V"
+	fi
+}
+
+check_lipo() {
+	if [ "$os" = "OSX" ] && [ "$enable_universal" != "0" ]
+	then
+		echo "int main(int argc, char *argv[]) { }" > lipo.test.c
+		$cc_host lipo.test.c -o lipo.test
+		check_compiler "host lipo" "lipo" "$host" "$lipo" "$LIPO" "lipo" "lipo" "4" "-info lipo.test"
+		rm -f lipo.test.c lipo.test
+	fi
+}
+
+check_direct_music() {
+	echo "
+		#include <windows.h>
+		#include <dmksctrl.h>
+		#include <dmusici.h>
+		#include <dmusicc.h>
+		#include <dmusicf.h>
+		int main(int argc, char *argv[]) { }" > direct_music.test.c
+	$cxx_host $CFLAGS direct_music.test.c -o direct_music.test 2> /dev/null
+	res=$?
+	rm -f direct_music.test.c direct_music.test
+
+	if [ "$res" != "0" ]
+	then
+		if [ "$with_direct_music" = "2" ]
+		then
+			log 1 "configure: error: direct-music is not available on this system"
+			exit 1
+		fi
+		with_direct_music="0"
+
+		log 1 "checking direct-music... not found"
+	else
+		log 1 "checking direct-music... found"
+	fi
+}
+
+check_makedepend() {
+	if [ "$with_makedepend" = "0" ]
+	then
+		log 1 "checking makedepend... disabled"
+		return
+	fi
+
+	if [ "$with_makedepend" = "1" ] || [ "$with_makedepend" = "2" ]
+	then
+		makedepend="makedepend"
+	else
+		makedepend="$with_makedepend"
+	fi
+
+	rm -f makedepend.tmp
+	touch makedepend.tmp
+	res=`$makedepend -fmakedepend.tmp 2>/dev/null`
+	res=$?
+	log 2 "executing $makedepend -f makedepend.tmp"
+	log 2 "  returned `cat makedepend.tmp`"
+	log 2 "  exit code $ret"
+
+	if [ -z "`cat makedepend.tmp`" ]
+	then
+		rm -f makedepend.tmp makedepend.tmp.bak
+
+		if [ "$with_makedepend" = "2" ]
+		then
+			log 1 "checking makedepend... not found"
+
+			log 1 "I couldn't detect any makedepend on your system"
+			log 1 "please locate it via --makedepend=[binary]"
+
+			exit 1
+		elif [ "$with_makedepend" != "1" ]
+		then
+			log 1 "checking makedepend... $makedepend not found"
+
+			log 1 "the selected file doesn't seem to be a valid makedepend binary"
+
+			exit 1
+		else
+			log 1 "checking makedepend... not found"
+
+			with_makedepend="0"
+			return
+		fi
+	fi
+
+	rm -f makedepend.tmp makedepend.tmp.bak
+
+	log 1 "checking makedepend... $makedepend"
+}
+
+detect_os() {
+	if [ $os = "DETECT" ]
+	then
+		# Detect UNIX, OSX, FREEBSD, MORPHOS, BEOS, SUNOS, CYGWIN, MINGW and OS2
+
+		# Try first via dumpmachine, then via uname
+		os=`echo "$host" | tr [:upper:] [:lower:] | awk '
+					/linux/        { print "UNIX";    exit}
+					/darwin/       { print "OSX";     exit}
+					/freebsd/      { print "FREEBSD"; exit}
+					/morphos/      { print "MORPHOS"; exit}
+					/beos/         { print "BEOS";    exit}
+					/sunos/        { print "SUNOS";   exit}
+					/cygwin/       { print "CYGWIN";  exit}
+					/mingw/        { print "MINGW";   exit}
+					/os\/2/        { print "OS2";     exit}
+		'`
+
+		if [ -z "$os" ]
+		then
+			os=`LC_ALL=C uname | tr [:upper:] [:lower:] | awk '
+					/linux/        { print "UNIX";    exit}
+					/darwin/       { print "OSX";     exit}
+					/freebsd/      { print "FREEBSD"; exit}
+					/morphos/      { print "MORPHOS"; exit}
+					/beos/         { print "BEOS";    exit}
+					/sunos/        { print "SUNOS";   exit}
+					/cygwin/       { print "CYGWIN";  exit}
+					/mingw/        { print "MINGW";   exit}
+					/os\/2/        { print "OS2";     exit}
+			'`
+		fi
+
+		if [ -z "$os" ]
+		then
+			log 1 "detecting OS... none detected"
+			log 1 "I couldn't detect your OS. Please use --with-os=OS to force one"
+			log 1 "Allowed values are: UNIX, OSX, FREEBSD, MORPHOS, BEOS, SUNOS, CYGWIN, and MINGW"
+			exit 1
+		fi
+
+		log 1 "detecting OS... $os"
+	else
+		log 1 "forcing OS... $os"
+	fi
+}
+
+detect_sdl() {
+	# 0 means no, 1 is auto-detect, 2 is force
+	if [ "$with_sdl" = "0" ]
+	then
+		log 1 "checking SDL... disabled"
+
+		sdl_config=""
+		return 0
+	fi
+
+	if [ "$with_sdl" = "2" ] && [ "$with_cocoa" = "2" ]
+	then
+		log 1 "configure: error: it is impossible to compile both SDL and COCOA"
+		log 1 "configure: error: please deselect one of them and try again"
+		exit 1
+	fi
+
+	if [ "$with_sdl" = "2" ] && [ "$enable_dedicated" != "0" ]
+	then
+		log 1 "configure: error: it is impossible to compile a dedicated with SDL"
+		log 1 "configure: error: please deselect one of them and try again"
+		exit 1
+	fi
+
+	if [ "$enable_dedicated" != "0" ]
+	then
+		log 1 "checking SDL... skipping"
+
+		sdl_config=""
+		return 0
+	fi
+
+	# By default on OSX we don't use SDL. The rest is auto-detect
+	if [ "$with_sdl" = "1" ] && [ "$os" = "OSX" ] && [ "$with_cocoa" != "0" ]
+	then
+		log 1 "checking SDL... OSX, skipping"
+
+		sdl_config=""
+		return 0
+	fi
+
+	if [ "$with_sdl" = "1" ] || [ "$with_sdl" = "" ] || [ "$with_sdl" = "2" ]
+	then
+		if [ "$os" = "FREEBSD" ]
+		then
+			sdl_config="sdl11-config"
+		else
+			sdl_config="sdl-config"
+		fi
+	else
+		sdl_config="$with_sdl"
+	fi
+
+	version=`$sdl_config --version 2>/dev/null`
+	ret=$?
+	log 2 "executing $sdl_config --version"
+	log 2 "  returned $version"
+	log 2 "  exit code $ret"
+
+	if [ -z $version ] || [ "$ret" != "0" ]
+	then
+		log 1 "checking SDL... not found"
+
+		# It was forced, so it should be found.
+		if [ "$with_sdl" != "1" ]
+		then
+			log 1 "configure: error: sdl-config couldn't be found"
+			log 1 "configure: error: you supplied '$with_sdl', but it seems invalid"
+			exit 1
+		fi
+
+		sdl_config=""
+		return 0
+	fi
+
+	log 1 "checking SDL... found"
+}
+
+detect_cocoa() {
+	# 0 means no, 1 is auto-detect, 2 is force
+	if [ "$with_cocoa" = "0" ]
+	then
+		log 1 "checking COCOA... disabled"
+
+		return 0
+	fi
+
+	if [ "$with_cocoa" = "2" ] && [ "$enable_dedicated" != "0" ]
+	then
+		log 1 "configure: error: it is impossible to compile a dedicated with COCOA"
+		log 1 "configure: error: please deselect one of them and try again"
+		exit 1
+	fi
+
+	if [ "$enable_dedicated" != "0" ]
+	then
+		log 1 "checking COCOA... skipping"
+
+		with_cocoa="0"
+		return 0
+	fi
+
+	# By default on OSX we use COCOA. The rest doesn't support it
+	if [ "$with_cocoa" = "1" ] && [ "$os" != "OSX" ]
+	then
+		log 1 "checking COCOA... not OSX, skipping"
+
+		with_cocoa="0"
+		return 0
+	fi
+
+	if [ "$os" != "OSX" ]
+	then
+		log 1 "checking COCOA... not OSX"
+
+		log 1 "configure: error: COCOA video driver is only supported for OSX"
+		exit 1
+	fi
+
+	log 1 "checking COCOA... found"
+}
+
+detect_zlib() {
+	# 0 means no, 1 is auto-detect, 2 is force
+	if [ "$with_zlib" = "0" ]
+	then
+		log 1 "checking zlib... disabled"
+
+		zlib=""
+		return 0
+	fi
+
+	log 2 "detecting zlib"
+
+	if [ "$with_zlib" = "1" ] || [ "$with_zlib" = "" ] || [ "$with_zlib" = "2" ]
+	then
+		zlib=`ls -1 /usr/include/*.h 2>/dev/null | grep "\/zlib.h$"`
+		if [ -z "$zlib" ]
+		then
+			log 2 "  trying /usr/include/zlib.h... no"
+			zlib=`ls -1 /usr/local/include/*.h 2>/dev/null | grep "\/zlib.h$"`
+		fi
+		if [ -z "$zlib" ]
+		then
+			log 2 "  trying /usr/local/include/zlib.h... no"
+		fi
+
+		if [ -n "$zlib" ] && [ "$enable_static" != "0" ] && [ "$os" != "OSX" ]
+		then
+			log 2 "  trying $zlib... found"
+			# Now find the static lib, if needed
+			zlib=`ls /lib/*.a 2>/dev/null | grep "\/libz.a$"`
+			if [ -z "$zlib" ]
+			then
+				log 2 "  trying /lib/libz.a... no"
+				zlib=`ls /usr/lib/*.a 2>/dev/null | grep "\/libz.a$"`
+			fi
+			if [ -z "$zlib" ]
+			then
+				log 2 "  trying /usr/lib/libz.a... no"
+				zlib=`ls /usr/local/lib/*.a 2>/dev/null | grep "\/libz.a$"`
+			fi
+			if [ -z "$zlib" ]
+			then
+				log 2 "  trying /usr/local/lib/libz.a... no"
+				log 1 "configure: error: zlib couldn't be found"
+				log 1 "configure: error: you requested a static link, but I can't find zlib.a"
+
+				exit 1
+			fi
+		fi
+	else
+		# Make sure it exists
+		zlib=`ls $with_zlib 2>/dev/null`
+	fi
+
+	if [ -z "$zlib" ]
+	then
+		log 1 "checking zlib... not found"
+		if [ "$with_zlib" = "2" ]
+		then
+			log 1 "configure: error: zlib couldn't be found"
+
+			exit 1
+		elif [ "$with_zlib" != "1" ]
+		then
+			log 1 "configure: error: zlib couldn't be found"
+			log 1 "configure: error: you supplied '$with_zlib', but it seems invalid"
+
+			exit 1
+		fi
+
+		return 0
+	fi
+
+	log 2 "  trying $zlib... found"
+
+	log 1 "checking zlib... found"
+}
+
+detect_png() {
+	# 0 means no, 1 is auto-detect, 2 is force
+	if [ "$with_png" = "0" ]
+	then
+		log 1 "checking libpng... disabled"
+
+		png_config=""
+		return 0
+	fi
+
+	if [ "$with_zlib" = "0" ] || [ "$zlib" = "" ]
+	then
+		log 1 "configure: error: libpng depends on zlib, which couldn't be found / was disabled"
+		log 1 "configure: error: please supply --with-zlib, with a valid zlib location"
+		exit 1
+	fi
+
+	if [ "$with_png" = "1" ] || [ "$with_png" = "" ] || [ "$with_png" = "2" ]
+	then
+		png_config="libpng-config"
+	else
+		png_config="$with_png"
+	fi
+
+	version=`$png_config --version 2>/dev/null`
+	ret=$?
+	log 2 "executing $png_config --version"
+	log 2 "  returned $version"
+	log 2 "  exit code $ret"
+
+	if [ -z "$version" ] || [ "$ret" != "0" ]
+	then
+		log 1 "checking libpng... not found"
+
+		# It was forced, so it should be found.
+		if [ "$with_png" != "1" ]
+		then
+			log 1 "configure: error: libpng-config couldn't be found"
+			log 1 "configure: error: you supplied '$with_png', but it seems invalid"
+			exit 1
+		fi
+
+		png_config=""
+		return 0
+	fi
+
+	log 1 "checking libpng... found"
+}
+
+detect_freetype() {
+	# 0 means no, 1 is auto-detect, 2 is force
+	if [ "$with_freetype" = "0" ]
+	then
+		log 1 "checking libfreetype... disabled"
+
+		freetype_config=""
+		return 0
+	fi
+
+	if [ "$with_zlib" = "0" ] || [ "$zlib" = "" ]
+	then
+		log 1 "configure: error: libfreetype depends on zlib, which couldn't be found / was disabled"
+		log 1 "configure: error: please supply --with-zlib, with a valid zlib location"
+		exit 1
+	fi
+
+	if [ "$with_freetype" = "1" ] || [ "$with_freetype" = "" ] || [ "$with_freetype" = "2" ]
+	then
+		freetype_config="freetype-config"
+	else
+		freetype_config="$with_freetype"
+	fi
+
+	version=`$freetype_config --version 2>/dev/null`
+	ret=$?
+	log 2 "executing freetype_config --version"
+	log 2 "  returned $version"
+	log 2 "  exit code $ret"
+
+	if [ -z "$version" ] || [ "$ret" != "0" ]
+	then
+		log 1 "checking libfreetype... not found"
+
+		# It was forced, so it should be found.
+		if [ "$with_freetype" != "1" ]
+		then
+			log 1 "configure: error: freetype-config couldn't be found"
+			log 1 "configure: error: you supplied '$with_freetype', but it seems invalid"
+			exit 1
+		fi
+
+		freetype_config=""
+		return 0
+	fi
+
+	log 1 "checking libfreetype... found"
+}
+
+detect_fontconfig() {
+	# 0 means no, 1 is auto-detect, 2 is force
+	if [ "$with_fontconfig" = "0" ]
+	then
+		log 1 "checking libfontconfig... disabled"
+
+		fontconfig_config=""
+		return 0
+	fi
+
+	if [ "$with_fontconfig" = "1" ] || [ "$with_fontconfig" = "" ] || [ "$with_fontconfig" = "2" ]
+	then
+		fontconfig_config="pkg-config fontconfig"
+	else
+		fontconfig_config="$with_fontconfig"
+	fi
+
+	version=`$fontconfig_config --modversion 2>/dev/null`
+	ret=$?
+	shortversion=`echo $version | cut -c 1,3`
+	log 2 "executing $fontconfig_config --modversion"
+	log 2 "  returned $version"
+	log 2 "  exit code $ret"
+
+	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$shortversion" -le "22" ]
+	then
+		if [ -n "$shortversion" ] && [ "$shortversion" -le "22" ]
+		then
+			log 1 "checking libfontconfig... needs at least version 2.3.0, fontconfig NOT enabled"
+		else
+			log 1 "checking libfontconfig... not found"
+		fi
+
+		# It was forced, so it should be found.
+		if [ "$with_fontconfig" != "1" ]
+		then
+			log 1 "configure: error: fontconfig-config couldn't be found"
+			log 1 "configure: error: you supplied '$with_fontconfig', but it seems invalid"
+			exit 1
+		fi
+
+		fontconfig_config=""
+		return 0
+	fi
+
+	log 1 "checking libfontconfig... found"
+}
+
+detect_iconv() {
+	# 0 means no, 1 is auto-detect, 2 is force
+	if [ "$with_iconv" = "0" ]
+	then
+		log 1 "checking iconv... disabled"
+
+		return 0
+	fi
+
+	if [ "$with_iconv" = "1" ] && [ "$os" != "OSX" ]
+	then
+		log 1 "checking iconv... not OSX, skipping"
+		with_iconv="0"
+
+		return 0
+	fi
+
+	# Try to find iconv.h, seems to only thing to detect iconv with
+
+	if [ "$with_iconv" = "1" ] || [ "$with_iconv" = "" ] || [ "$with_iconv" = "2" ]
+	then
+		iconv=`ls -1 /usr/include 2>/dev/null | grep "iconv.h"`
+		if [ -z "$iconv" ]
+		then
+			iconv=`ls -1 /usr/local/include 2>/dev/null | grep "iconv.h"`
+		fi
+	else
+		# Make sure it exists
+		iconv=`ls $with_iconv/include/iconv.h 2>/dev/null`
+	fi
+
+	if [ -z "$iconv" ]
+	then
+		log 1 "checking iconv... not found"
+		if [ "$with_iconv" = "2" ]
+		then
+			log 1 "configure: error: iconv couldn't be found"
+
+			exit 1
+		elif [ "$with_iconv" != "1" ]
+		then
+			log 1 "configure: error: iconv couldn't be found"
+			log 1 "configure: error: you supplied '$with_iconv', but I couldn't detect iconv in it"
+
+			exit 1
+		fi
+
+		return 0
+	fi
+
+	if [ "$with_iconv" = "1" ]
+	then
+		with_iconv="2"
+	fi
+
+	log 2 "found iconv in $iconv"
+
+	log 1 "checking iconv... found"
+}
+
+_detect_sort() {
+	sort_test_in="d
+a
+c
+b"
+
+	sort_test_out="a
+b
+c
+d"
+
+	log 2 "running echo <array> | $1"
+
+	if [ "`echo \"$sort_test_in\" | $1 2>/dev/null`" = "$sort_test_out" ]
+	then
+		sort="$1"
+		log 2 "  result was valid"
+	else
+		log 2 "  result was invalid"
+	fi
+}
+
+detect_sort() {
+	if [ "$with_sort" = "0" ]
+	then
+		log 1 "checking sort... disabled"
+
+		return
+	fi
+
+	if [ "$with_sort" = "1" ] || [ "$with_sort" = "2" ]
+	then
+		_detect_sort "sort"
+		if [ -z "$sort" ]; then _detect_sort "/sbin/sort"; fi
+		if [ -z "$sort" ]; then _detect_sort "/usr/sbin/sort"; fi
+		if [ -z "$sort" ]; then _detect_sort "/usr/local/sbin/sort"; fi
+		if [ -z "$sort" ]; then _detect_sort "/bin/sort"; fi
+		if [ -z "$sort" ]; then _detect_sort "/usr/bin/sort"; fi
+		if [ -z "$sort" ]; then _detect_sort "/usr/local/bin/sort"; fi
+	else
+		_detect_sort "$with_sort"
+	fi
+
+	if [ -z "$sort" ]
+	then
+		if [ "$with_sort" = "2" ]
+		then
+			log 1 "checking sort... not found"
+
+			log 1 "configure: error: couldn't detect sort on your system"
+			exit 1
+		elif [ "$with_sort" != "1" ]
+		then
+			log 1 "checking sort... $with_sort not found"
+
+			log 1 "configure: error: '$with_sort' doesn't look like a sort to me"
+			log 1 "configure: error: please verify its location and function and try again"
+
+			exit 1
+		else
+			log 1 "checking sort... not found"
+		fi
+	else
+		log 1 "checking sort... $sort"
+	fi
+}
+
+make_sed() {
+	# We check here if we are PPC, because then we need to enable FOUR_BYTE_BOOL
+	#  We do this here, and not sooner, so universal builds also have this
+	#  automaticly correct
+	# FOUR_BYTE_BOOL is needed, because C++ uses 4byte for a bool on PPC, where
+	#  we use 1 byte per bool normally in C part. So convert that last one to 4
+	#  bytes too, but only for PPC.
+	ppc=`$cc_host -dumpmachine | grep "powerpc\|ppc"`
+	if [ -n "$ppc" ]
+	then
+		T_CFLAGS="$CFLAGS -DFOUR_BYTE_BOOL"
+		osx_sysroot_version=10.3.9
+	else
+		T_CFLAGS="$CFLAGS"
+		osx_sysroot_version=10.4u
+	fi
+
+	T_LDFLAGS="$LDFLAGS"
+	if [ "$with_osx_sysroot" = "3" ]
+	then
+		T_CFLAGS="$T_CFLAGS -isysroot /Developer/SDKs/MacOSX$osx_sysroot_version.sdk"
+		T_LDFLAGS="$T_LDFLAGS -Wl,-syslibroot,/Developer/SDKs/MacOSX$osx_sysroot_version.sdk"
+	fi
+
+	SRC_OBJS_DIR="$BASE_SRC_OBJS_DIR/$OBJS_SUBDIR"
+
+	# All the data needed to compile a single target
+	#  Make sure if you compile multiple targets to
+	#  use multiple OBJS_DIR, because all in-between
+	#  binaries are stored in there, and nowhere else.
+	SRC_REPLACE="
+		s#!!CC_HOST!!#$cc_host#g;
+		s#!!CXX_HOST!!#$cxx_host#g;
+		s#!!CC_BUILD!!#$cc_build#g;
+		s#!!WINDRES!!#$windres#g;
+		s#!!STRIP!!#$strip $strip_arg#g;
+		s#!!LIPO!!#$lipo#g;
+		s#!!CC_CFLAGS!!#$CC_CFLAGS#g;
+		s#!!CFLAGS!!#$T_CFLAGS#g;
+		s#!!CFLAGS_BUILD!!#$CFLAGS_BUILD#g;
+		s#!!STRGEN_FLAGS!!#$strgen_flags#g;
+		s#!!LIBS!!#$LIBS#g;
+		s#!!LDFLAGS!!#$T_LDFLAGS#g;
+		s#!!BIN_DIR!!#$BIN_DIR#g;
+		s#!!ROOT_DIR!!#$ROOT_DIR#g;
+		s#!!MEDIA_DIR!!#$MEDIA_DIR#g;
+		s#!!SOURCE_LIST!!#$SOURCE_LIST#g;
+		s#!!SRC_OBJS_DIR!!#$SRC_OBJS_DIR#g;
+		s#!!LANG_OBJS_DIR!!#$LANG_OBJS_DIR#g;
+		s#!!SRC_DIR!!#$SRC_DIR#g;
+		s#!!OSXAPP!!#$OSXAPP#g;
+		s#!!LANG_DIR!!#$LANG_DIR#g;
+		s#!!TTD!!#$TTD#g;
+		s#!!BINARY_DIR!!#$prefix_dir/$binary_dir#g;
+		s#!!DATA_DIR!!#$prefix_dir/$data_dir#g;
+		s#!!ICON_DIR!!#$prefix_dir/$icon_dir#g;
+		s#!!PERSONAL_DIR!!#$personal_dir#g;
+		s#!!INSTALL_DIR!!#$install_dir#g;
+		s#!!STRGEN!!#$STRGEN#g;
+		s#!!ENDIAN_CHECK!!#$ENDIAN_CHECK#g;
+		s#!!ENDIAN_FORCE!!#$endian#g;
+		s#!!STAGE!!#$STAGE#g;
+		s#!!MAKEDEPEND!!#$makedepend#g;
+		s#!!CFLAGS_MAKEDEP!!#$cflags_makedep#g;
+		s#!!SORT!!#$sort#g;
+		s#!!CONFIG_CACHE_COMPILER!!#config.cache.compiler#g;
+		s#!!CONFIG_CACHE_LINKER!!#config.cache.linker#g;
+		s#!!CONFIG_CACHE_ENDIAN!!#config.cache.endian#g;
+		s#!!CONFIG_CACHE_SOURCE!!#config.cache.source#g;
+		s#!!CONFIG_CACHE_VERSION!!#config.cache.version#g;
+		s#!!CONFIG_CACHE_SOURCE_LIST!!#config.cache.source.list#g;
+		s#!!LANG_SUPPRESS!!#$lang_suppress#g;
+		s#!!OBJS_C!!#$OBJS_C#g;
+		s#!!OBJS_CPP!!#$OBJS_CPP#g;
+		s#!!OBJS_M!!#$OBJS_M#g;
+		s#!!OBJS_RC!!#$OBJS_RC#g;
+		s#!!SRCS!!#$SRCS#g;
+		s#!!OS!!#$os#g;
+		s#!!CONFIGURE_FILES!!#$CONFIGURE_FILES#g;
+		s#!!REVISION!!#$revision#g;
+		s#!!ENABLE_INSTALL!!#$enable_install#g;
+	"
+}
+
+generate_main() {
+	STAGE="[MAIN]"
+
+	make_sed
+
+	# Create the main Makefile
+	echo "Generating Makefile..."
+	cat $ROOT_DIR/Makefile.in | sed "$SRC_REPLACE" > Makefile
+	echo "# Auto-generated file -- DO NOT EDIT" > Makefile.am
+	echo "" > Makefile.am
+	# Make the copy of the source-list, so we don't trigger an unwanted recompile
+	cp $SOURCE_LIST config.cache.source.list
+	# Make sure config.cache is OLDER then config.cache.source.list
+	touch config.cache
+}
+
+generate_lang() {
+	STAGE="[LANG]"
+
+	make_sed
+
+	# Create the language file
+	mkdir -p $LANG_OBJS_DIR
+
+	echo "Generating lang/Makefile..."
+	cat $ROOT_DIR/Makefile.lang.in | sed "$SRC_REPLACE" > $LANG_OBJS_DIR/Makefile
+	echo "DIRS += $LANG_OBJS_DIR" >> Makefile.am
+	echo "LANG_DIRS += $LANG_OBJS_DIR" >> Makefile.am
+}
+
+generate_src_normal() {
+	STAGE=$1
+
+	make_sed
+
+	# Create the source file
+	mkdir -p $SRC_OBJS_DIR
+
+	echo "Generating $2/Makefile..."
+	cat $ROOT_DIR/Makefile.src.in | sed "$SRC_REPLACE" > $SRC_OBJS_DIR/Makefile
+	echo "DIRS += $SRC_OBJS_DIR" >> Makefile.am
+	echo "SRC_DIRS += $SRC_OBJS_DIR" >> Makefile.am
+}
+
+generate_src_osx() {
+	cc_host_orig="$cc_host"
+	cxx_host_orig="$cxx_host"
+
+	BASE_SRC_OBJS_DIR="$OBJS_DIR/ppc"
+	cc_host="$cc_host_orig -arch ppc"
+	cxx_host="$cxx_host_orig -arch ppc"
+	generate_src_normal "[PowerPC]" "objs/ppc"
+
+	BASE_SRC_OBJS_DIR="$OBJS_DIR/i386"
+	cc_host="$cc_host_orig -arch i386"
+	cxx_host="$cxx_host_orig -arch i386"
+	generate_src_normal "[i386]" "objs/i386"
+
+	BASE_SRC_OBJS_DIR="$OBJS_DIR/ppc970"
+	cc_host="$cc_host_orig -arch ppc970"
+	cxx_host="$cxx_host_orig -arch ppc970"
+	CFLAGS="$CFLAGS -mtune=970 -mcpu=970 -mpowerpc-gpopt"
+	generate_src_normal "[PowerPC G5]" "objs/ppc970"
+}
+
+generate_src() {
+	if [ "$os" = "OSX" ] && [ "$enable_universal" != "0" ]
+	then
+		generate_src_osx
+	else
+		generate_src_normal "[SRC]" "objs"
+	fi
+}
+
+showhelp() {
+	echo "'configure' configures OpenTTD."
+	echo ""
+	echo "Usage: $0 [OPTION]... [VAR=VALUE]..."
+	echo ""
+	echo "To assign environment variables (e.g., CC, CFLAGS...), specify them as"
+	echo "VAR=VALUE.  See below for descriptions of some of the useful variables."
+	echo ""
+	echo "Defaults for the options are specified in brackets."
+	echo ""
+	echo "Configuration:"
+	echo "  -h, --help                     display this help and exit"
+	echo ""
+	echo "System types:"
+	echo "  --build=BUILD                  configure for building on BUILD [guessed]"
+	echo "  --host=HOST                    cross-compile to build programs to run on HOST [BUILD]"
+	echo "  --windres=WINDRES              the windres to use [HOST-windres]"
+	echo "  --strip=STRIP                  the strip to use [HOST-strip]"
+	echo "  --lipo=LIPO                    the lipo to use (OSX ONLY) [HOST-lipo]"
+	echo "  --os=OS                        the OS we are compiling for [DETECT]"
+	echo "                                 DETECT/UNIX/OSX/FREEBSD/MORPHOS/BEOS/SUNOS/CYGWIN/MINGW"
+	echo "  --endian=ENDIAN                set the endian of the HOST (AUTO/LE/BE) [AUTO]"
+	echo "  --revision=rXXXX               overwrite the revision detection. Use with care!"
+	echo ""
+	echo "Paths:"
+	echo "  --prefix-dir=dir               specifies the prefix for all installed files [/usr/local]"
+	echo "  --binary-dir=dir               location of the binary. Will be prefixed with the"
+	echo "                                 prefix-dir [games]"
+	echo "  --data-dir=dir                 location of data files (lang, data, gm, scenario)."
+	echo "                                 Will be prefixed with the prefix-dir [share/games/openttd]"
+	echo "  --icon-dir=dir                 location of icons. Will be prefixed with the"
+	echo "                                 prefix-dir [share/pixmaps]"
+	echo "  --personal-dir=dir             location of the personal directory []"
+	echo "  --install-dir=dir              specifies the root to install to. Useful to install"
+	echo "                                 into jails [/]"
+	echo ""
+# TODO: The Following 3 tags will be removed when the 'search path patch' is applied
+	echo "  --second-data-dir=dir          specifies a second directory for the data files"
+	echo "  --custom-lang-dir=dir          specifies a custom directory for the language files"
+	echo "  --enable-install               make a binary that uses the specified data-dir and icon-dir"
+	echo ""
+	echo "Features and packages:"
+	echo "  --enable-debug[=LVL]           enable debug-mode (LVL=[0123], 0 is release) [LVL=0]"
+	echo "  --enable-profiling             enables profiling (can be mixed with --enable-debug)"
+	echo "  --enable-dedicated             compile a dedicated server (without video-drivers)"
+	echo "  --enable-static                enable static compile (doesn't work for all HOSTs)"
+	echo "  --enable-translator            enable extra output for translators"
+	echo "  --enable-universal             enable universal builds (OSX ONLY)"
+	echo "  --enable-osx-g5                enables optimalizations for G5 (OSX ONLY)"
+	echo "  --disable-network              disable network support"
+	echo "  --disable-assert               disable asserts (on error, program just continues)"
+	echo "  --disable-strip                disable any possible stripping"
+	echo "  --without-osx-sysroot          disable the automatic adding of sysroot (OSX ONLY)"
+	echo "  --without-application-bundle   disable generation of application bundle (OSX ONLY)"
+	echo "  --with-direct-music            enable direct music support (Win32 ONLY)"
+	echo "  --with-sort=sort               define a non-default location for sort"
+	echo "  --with-midi=midi               define which midi-player to use"
+	echo "  --with-midi-arg=arg            define which args to use for the midi-player"
+	echo "  --with-cocoa                   enables COCOA video driver (OSX ONLY) support"
+	echo "  --with-sdl[=sdl-config]        enables SDL video driver support"
+	echo "  --with-zlib[=zlib.a]           enables zlib support"
+	echo "  --with-png[=libpng-config]     enables libpng support"
+	echo "  --with-freetype[=freetype-config]"
+	echo "                                 enables libfreetype support"
+	echo "  --with-fontconfig[=pkg-config fontconfig]"
+	echo "                                 enables fontconfig support"
+	echo "  --with-iconv[=iconv-path]      enables iconv support"
+	echo "  --with-makedepend[=makedepend] enables makedepend support"
+	echo ""
+	echo "Some influential environment variables:"
+	echo "  CC                             C compiler command"
+	echo "  CXX                            C++ compiler command"
+	echo "  CFLAGS                         C compiler flags"
+	echo "  WINDRES                        windres command"
+	echo "  LDFLAGS                        linker flags, e.g. -L<lib dir> if you have libraries"
+	echo "                                 in a nonstandard directory <lib dir>"
+	echo ""
+	echo "Use these variables to override the choices made by 'configure' or to help"
+	echo "it to find libraries and programs with nonstandard names/locations."
+}
diff --git a/configure b/configure
index 2fd293954..49f26b682 100755
--- a/configure
+++ b/configure
@@ -1,323 +1,121 @@
 #!/bin/sh
 
-# This 'configure' script is a very easy wrapper around 'make updateconf'
-#  It allows cross-compilers to do their job much more easy.
+# Find out where configure is (in what dir)
+ROOT_DIR="`dirname $0`"
+ROOT_DIR="`cd $ROOT_DIR && pwd`"
 
-function showhelp() {
-	echo "Configure for OpenTTD"
-	echo ""
-	echo "Usage:"
-	echo " $0 --your_options"
-	echo ""
-	echo "Params:"
-	echo " --debug             Create debug-release                [no]"
-	echo " --profile           Create profile-release              [no]"
-	echo " --dedicated         Make a dedicated build              [no]"
-	echo " --revision          Set the revision of the compilation [detected]"
-	echo " --target-cc         Sets the target-compiler            [\$CC]"
-	echo " --target-cxx        Sets the C++ target-compiler        []"
-	echo " --host-cc           Sets the host-compiler              [\$CC]"
-	echo " --host-cxx          Sets the C++ host-compiler          []"
-	echo " --os                Sets the OS. Listens to:            [detected]"
-	echo "                        UNIX, OSX, FREEBSD, MORPHOS"
-	echo "                        BEOS, SUNOS, CYGWIN, MINGW, OS2"
-	echo " --windres           Sets the windres (Windows)          [windres]"
-	echo " --force-le          Force LE platform                   [no]"
-	echo " --force-be          Force BE platform                   [no]"
-	echo ""
-	echo "Params that can be used with --with or --without"
-	echo "   (e.g.: --without-static disables static (default))"
-	echo " static              Do you want a static build?         [no]"
-	echo " directmusic         Do you want direct-music?           [no]"
-	echo " zlib                Do you want zlib-support?           [yes]"
-	echo " sdl                 Do you want SDL-support?            [yes]"
-	echo " png                 Do you want PNG-support?            [yes]"
-	echo " iconv               Do you want iconv-support?          [no]"
-	echo " network             Do you want network-support?        [yes]"
-	echo " cocoa               Do you want cocoa-support? (MacOSX) [no]"
-	echo " freetype            Do you want freetype-support?       [yes]"
-	echo " fontconfig          Do you want fontconfig-support?     [yes]"
-	echo ""
-	echo "Params used to configure external libs:"
-	echo " --static-zlib-path  Set the path to your static zlib    []"
-	echo " --sdl-config        Where is your sdl-config            [sdl-config]"
-	echo " --libpng-config     Where is your libpng-config         [libpng-config]"
-	echo " --freetype-config   Where is your freetype-config       [freetype-config]"
-	echo " --fontconfig-config Where is your fontconfig-config     [pkg-config fontconfig]"
-	echo " --with-iconv        Set the path to your iconv headers  []"
-	echo " "
-}
+PWD="`pwd`"
+PREFIX="`pwd`/bin"
 
-function handle() {
-	PARAM="$PARAM \"$1=`awk 'BEGIN { FS="="; $0="'"$2"'"; print $2;}'`\""
-}
+. $ROOT_DIR/config.lib
 
-# The things you can use inside this case:
-#  handle NAME VALUE - Sets the value to give the 'make upgradeconf'
-#                         Value is in form: tag=REAL_VALUE
-#  ITEM="NAME"       - Will set the value as above, only with the next param
-#  SITEM="NAME"      - Will set the var $NAME to the next param
-for n in "$@"
-do
-	case "$n" in
-		--help | -h)
-			showhelp
-			exit 0
-			;;
+# Set default dirs
+OBJS_DIR="$PWD/objs"
+BASE_SRC_OBJS_DIR="$OBJS_DIR"
+LANG_OBJS_DIR="$OBJS_DIR/lang"
+BIN_DIR="$PREFIX"
+SRC_DIR="$ROOT_DIR/src"
+LANG_DIR="$SRC_DIR/lang"
+MEDIA_DIR="$ROOT_DIR/media"
+SOURCE_LIST="$ROOT_DIR/source.list"
 
-		--debug)
-			DEBUG_SET=1
-			ITEM="DEBUG"
-			;;
-		--debug=*)
-			handle "DEBUG" "$n"
-			;;
-		--profile)
-			PARAM="$PARAM PROFILE=1"
-			;;
-		--dedicated)
-			PARAM="$PARAM DEDICATED=1"
-			;;
-		--revision=*)
-			RELEASE=`awk 'BEGIN { FS="="; $0="'"$n"'"; print $2;}'`
-			;;
-		--revision)
-			SITEM="RELEASE"
-			;;
-		--target-cc=*)
-			handle "CC_TARGET" "$n"
-			;;
-		--target-cc)
-			ITEM="CC_TARGET"
-			;;
-		--target-cxx=*)
-			handle "CXX_TARGET" "$n"
-			;;
-		--target-cxx)
-			SITEM="CXX_TARGET"
-			;;
-		--host-cc=*)
-			handle "CC_HOST" "$n"
-			;;
-		--host-cc)
-			ITEM="CC_HOST"
-			;;
-		--host-cxx=*)
-			handle "CXX_HOST" "$n"
-			;;
-		--host-cxx)
-			ITEM="CXX_HOST"
-			;;
-		--host-cflags=*)
-			handle CFLAGS_HOST "$n"
-			;;
-		--host-cflags)
-			ITEM="CFLAGS_HOST"
-			;;
-		--os=*)
-			TARGET_OS=`awk 'BEGIN { FS="="; $0="'"$n"'"; print $2;}'`
-			;;
-		--os)
-			SITEM="TARGET_OS"
-			;;
-		--windres=*)
-			handle WINDRES "$n"
-			;;
-		--windres)
-			ITEM="WINDRES"
-			;;
-		--force-le)
-			PARAM="$PARAM ENDIAN_FORCE=LE"
-			;;
-		--force-be)
-			PARAM="$PARAM ENDIAN_FORCE=BE"
-			;;
+if [ "$1" = "--reconfig" ]
+then
+	if ! [ -f "config.cache" ]
+	then
+		echo "can't reconfigure, because never configured before"
+		exit 1
+	fi
+	# Make sure we don't lock config.cache
+	configure=`cat config.cache`
+	$configure
+	exit $?
+fi
 
-		--with-static)
-			PARAM="$PARAM STATIC=1"
-			;;
-		--without-static)
-			PARAM="$PARAM STATIC="
-			;;
-		--with-directmusic)
-			PARAM="$PARAM WITH_DIRECTMUSIC=1"
-			;;
-		--without-directmusic)
-			PARAM="$PARAM WITH_DIRECTMUSIC="
-			;;
-		--with-zlib)
-			PARAM="$PARAM WITH_ZLIB=1"
-			;;
-		--without-zlib)
-			PARAM="$PARAM WITH_ZLIB="
-			;;
-		--with-sdl)
-			PARAM="$PARAM WITH_SDL=1"
-			;;
-		--without-sdl)
-			PARAM="$PARAM WITH_SDL="
-			;;
-		--with-png)
-			PARAM="$PARAM WITH_PNG=1"
-			;;
-		--without-png)
-			PARAM="$PARAM WITH_PNG="
-			;;
-		--with-iconv)
-			PARAM="$PARAM WITH_ICONV=1"
-			;;
-		--with-iconv=*)
-			PARAM="$PARAM WITH_ICONV=1"
-			handle WITH_ICONV_PATH "$n"
-			;;
-		--without-iconv)
-			PARAM="$PARAM WITH_ICONV="
-			;;
-		--with-cocoa)
-			PARAM="$PARAM WITH_COCOA=1"
-			;;
-		--with-network)
-			PARAM="$PARAM WITH_NETWORK=1"
-			;;
-		--without-network)
-			PARAM="$PARAM WITH_NETWORK="
-			;;
-		--without-cocoa)
-			PARAM="$PARAM WITH_COCOA="
-			;;
-		--with-freetype)
-			PARAM="$PARAM WITH_FREETYPE=1"
-			;;
-		--without-freetype)
-			PARAM="$PARAM WITH_FREETYPE="
-			;;
-		--with-fontconfig)
-			PARAM="$PARAM WITH_FONTCONFIG=1"
-			;;
-		--without-fontconfig)
-			PARAM="$PARAM WITH_FONTCONFIG="
-			;;
-		--static-zlib-path=*)
-			handle STATIC_ZLIB_PATH "$n"
-			;;
-		--static-zlib-path)
-			ITEM="STATIC_ZLIB_PATH"
-			;;
-		--sdl-config=*)
-			handle SDL_CONFIG "$n"
-			;;
-		--sdl-config)
-			ITEM="SDL_CONFIG"
-			;;
-		--libpng-config=*)
-			handle LIBPNG_CONFIG "$n"
-			;;
-		--libpng-config)
-			ITEM="LIBPNG_CONFIG"
-			;;
-		--freetype-config=*)
-			handle FREETYPE_CONFIG "$n"
-			;;
-		--freetype-config)
-			ITEM="FREETYPE_CONFIG"
-			;;
-		--fontconfig-config=*)
-			handle FONTCONFIG_CONFIG "$n"
-			;;
-		--fontconfig-config)
-			ITEM="FONTCONFIG_CONFIG"
-			;;
+set_default
+detect_params $@
+save_params
+check_params
+make_cflags_and_ldflags
 
-		--*=*)
-			echo -n "Unknown switch "
-			echo `awk 'BEGIN { FS="="; $0="'"$n"'"; print $1;}'`
-			exit 1
-			;;
-		-*)
-			echo "Unknown switch $n"
-			exit 1
-			;;
+EXE=""
+if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "OS2" ]
+then
+	EXE=".exe"
+fi
 
-		*)
-			if ! test -z "$ITEM"
-			then
-				PARAM="$PARAM $ITEM=\"$n\""
-				ITEM="";
-			elif ! test -z "$SITEM"
-			then
-				export $SITEM="$n"
-				SITEM=""
-			else
-				echo "Unknown switch $n"
-				exit 1
-			fi
-			;;
-	esac
-done
+TTD="openttd$EXE"
+STRGEN="strgen$EXE"
+ENDIAN_CHECK="endian_check$EXE"
 
-if ! test -z "$TARGET_OS"
+if [ -z "$sort" ]
 then
-	TARGET_OS=`echo $TARGET_OS | tr '[:lower:]' '[:upper:]'`
-	case "$TARGET_OS" in
-		WIN32)
-			PARAM="$PARAM WIN32=1"
-			;;
-		UNIX)
-			PARAM="$PARAM UNIX=1"
-			;;
-		OSX)
-			PARAM="$PARAM OSX=1 UNIX=1"
-			;;
-		FREEBSD)
-			PARAM="$PARAM FREEBSD=1"
-			;;
-		MORPHOS)
-			PARAM="$PARAM MORPHOS=1 UNIX=1"
-			;;
-		BEOS)
-			PARAM="$PARAM BEOS=1 UNIX=1"
-			;;
-		OS2)
-			PARAM="$PARAM OS2=1 UNIX=1"
-			;;
-		SUNOS)
-			PARAM="$PARAM SUNOS=1 UNIX=1"
-			;;
-		CYGWIN)
-			PARAM="$PARAM CYGWIN=1 WIN32=1"
-			;;
-		MINGW)
-			PARAM="$PARAM MINGW=1 WIN32=1"
-			;;
-		*)
-			echo "Unknown OS: $TARGET_OS"
-			exit 1
-			;;
-	esac
-	PARAM="$PARAM BYPASS_OS_DETECT=1"
+	PIPE_SORT="sed s/a/a/"
+else
+	PIPE_SORT="$sort"
 fi
 
-if ! test -z "$DEBUG_SET"
+if ! [ -f "$LANG_DIR/english.txt" ]
 then
-	if test -z "`echo $PARAM | grep "DEBUG="`"
-	then
-		# Someone did --debug, without assigning a value, assume 1
-		PARAM="$PARAM DEBUG=1"
-	fi
+	echo "Languages not found in $LANG_DIR. Can't continue without it."
+	echo "Please make sure the dir exists and contains at least english.txt"
 fi
 
-# First remove the Makefile.config, else you can have double entries
-rm -f Makefile.config
+# Read the source.list and process it
+SRCS="`cat $ROOT_DIR/source.list | tr '\r' '\n' | awk '
+	{  }
+	/^(	*)#end/  { if (deep == skip) { skip -= 1; } deep -= 1; next; }
+	/^(	*)#else/ { if (deep == skip) { skip -= 1; } else if (deep - 1 == skip) { skip += 1; } next; }
+	/^(	*)#if/   {
+		gsub("	", "", $0);
+		gsub("^#if ", "", $0);
+
+		if (deep != skip) { deep += 1; next; }
+
+		deep += 1;
 
-echo "make upgradeconf $PARAM" > Makefile.run
-. Makefile.run
-rm -f Makefile.run
+		if ($0 == "SDL"         && "'$sdl_config'" == "")          { next; }
+		if ($0 == "OSX"         && "'$os'" != "OSX")               { next; }
+		if ($0 == "DEDICATED"   && "'$enable_dedicated'" != "1")   { next; }
+		if ($0 == "COCOA"       && "'$with_cocoa'" == "0")         { next; }
+		if ($0 == "BEOS"        && "'$os'" != "BEOS")              { next; }
+		if ($0 == "WIN32"       && "'$os'" != "MINGW" &&
+		                "'$os'" != "CYGWIN" && "'$os'" != "MSVC" ) { next; }
+		if ($0 == "MSVC"        && "'$os'" != "MSVC")              { next; }
+		if ($0 == "DIRECTMUSIC" && "'$with_direct_music'" != "1")  { next; }
 
-# Makefile.config currently doesn't support custom RELEASE (revision), so, we add the line
-# yourself!
+		skip += 1;
 
-if ! test -z "$RELEASE"
+		next;
+	}
+	/^(	*)#/ { next }
+	/^$/ { next }
+	/\.h$/ { next }
+	/\.hpp$/ { next }
+	{
+		if (deep == skip) {
+			gsub("	", "", $0);
+			print $0;
+		}
+	}
+' | $PIPE_SORT`"
+
+OBJS_C="`  echo \"$SRCS\" | awk ' { ORS = " " } /\.c$/   { gsub(".c$",   ".o", $0); print $0; }'`"
+OBJS_CPP="`echo \"$SRCS\" | awk ' { ORS = " " } /\.cpp$/ { gsub(".cpp$", ".o", $0); print $0; }'`"
+OBJS_M="`  echo \"$SRCS\" | awk ' { ORS = " " } /\.m$/   { gsub(".m$",   ".o", $0); print $0; }'`"
+OBJS_RC="` echo \"$SRCS\" | awk ' { ORS = " " } /\.rc$/  { gsub(".rc$",  ".o", $0); print $0; }'`"
+SRCS="`    echo \"$SRCS\" | awk ' { ORS = " " } { print $0; }'`"
+
+# In makefiles, we always use -u for sort
+if [ -z "$sort" ]
 then
-	echo "RELEASE=$RELEASE" >> Makefile.config
+	sort="sed s/a/a/"
+else
+	sort="$sort -u"
 fi
 
+CONFIGURE_FILES="$ROOT_DIR/configure $ROOT_DIR/config.lib $ROOT_DIR/Makefile.in $ROOT_DIR/Makefile.lang.in $ROOT_DIR/Makefile.src.in"
+
+generate_main
+generate_lang
+generate_src
diff --git a/docs/Manual.txt b/docs/Manual.txt
index 7880d5f6a..73124b0e6 100644
--- a/docs/Manual.txt
+++ b/docs/Manual.txt
@@ -13,7 +13,7 @@ Once you have obtained a recent copy of the source, you must build it. Windows b
 On UNIX platforms (including OS-X and BeOS), ensure you have a recent GCC (2.9  or above, or 3 and above).You will also need SDL development headers and libraries (libSDL 1.2 or higher). For PNG screenshot support and zlib compressed games, you will need libpng 1.0.12 or higher and zlib 1.2 or higher.
 
 Most UNIX platforms:
-Use make or gmake to compile OpenTTD. You can adjust Makefile.config to compile with other options.
+First run ./configure, them use make or gmake to compile OpenTTD. You can configure the different compile options via ./configure.
 
 BeOS:
 On BeOS, run ./configure and then use jam. There are a variaty of options you can pass to your build tool, these are reported by ./configure.
diff --git a/langs.vcproj b/langs.vcproj
deleted file mode 100644
index 27295ab90..000000000
--- a/langs.vcproj
+++ /dev/null
@@ -1,392 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="langs"
-	ProjectGUID="{0F066B23-18DF-4284-8265-F4A5E7E3B966}"
-	RootNamespace="langs"
-	SccProjectName=""
-	SccLocalPath=""
-	Keyword="MakeFileProj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="."
-			IntermediateDirectory="."
-			ConfigurationType="10"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName="./langs.tlb"
-				HeaderFileName=""/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"
-				Description="Generating strings.h"
-				CommandLine="strgen\debug\strgen.exe -s lang -d table"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath=".\lang\american.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating american language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\american.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\brazilian_portuguese.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating brazilian_portuguese language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\brazilian_portuguese.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\bulgarian.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating bulgarian language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\bulgarian.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\catalan.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating catalan language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\catalan.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\czech.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating czech language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\czech.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\danish.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating danish language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\danish.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\dutch.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating dutch language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\dutch.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="lang\english.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating english language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\english.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\esperanto.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating esperanto language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\esperanto.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\estonian.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating estonian language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\estonian.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\finnish.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating finnish language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\finnish.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\french.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating french language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\french.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\galician.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating galician language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\galician.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\german.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating german language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\german.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\hungarian.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating hungarian language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\hungarian.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\icelandic.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating icelandic language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\icelandic.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\italian.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating italian language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\italian.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\lithuanian.txt">
-			<FileConfiguration
-				Name="Debug|Win32"
-				ExcludedFromBuild="TRUE">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating lithuanian language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\lithuanian.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\norwegian.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating norwegian language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\norwegian.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\origveh.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating Original Vehicle names file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\origveh.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\polish.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating polish language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\polish.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\portuguese.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating portuguese language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\portuguese.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\romanian.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating romanian language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\romanian.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\russian.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating russian language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\russian.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\slovak.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating slovak language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\slovak.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\spanish.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating spanish language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\spanish.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="lang\swedish.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating swedish language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\swedish.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\turkish.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating turkish language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\turkish.lng"/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\ukrainian.txt">
-			<FileConfiguration
-				Name="Debug|Win32">
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating ukrainian language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
-"
-					Outputs="lang\ukrainian.lng"/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/langs_vs80.vcproj b/langs_vs80.vcproj
deleted file mode 100644
index 7f0b22421..000000000
--- a/langs_vs80.vcproj
+++ /dev/null
@@ -1,458 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="langs"
-	ProjectGUID="{0F066B23-18DF-4284-8265-F4A5E7E3B966}"
-	RootNamespace="langs"
-	Keyword="MakeFileProj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="."
-			IntermediateDirectory="."
-			ConfigurationType="10"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				Description="Generating strings.h"
-				CommandLine="strgen\debug\strgen.exe -s lang -d table"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName="./langs.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath=".\lang\american.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating american language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					Outputs="lang\american.lng"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\brazilian_portuguese.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating brazilian_portuguese language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					Outputs="lang\brazilian_portuguese.lng"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\bulgarian.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating bulgarian language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					Outputs="lang\bulgarian.lng"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\catalan.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating catalan language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					Outputs="lang\catalan.lng"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\czech.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating czech language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					Outputs="lang\czech.lng"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\danish.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating danish language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					Outputs="lang\danish.lng"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\dutch.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating dutch language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					Outputs="lang\dutch.lng"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="lang\english.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating english language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					Outputs="lang\english.lng"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\esperanto.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating esperanto language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					Outputs="lang\esperanto.lng"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\estonian.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating estonian language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					Outputs="lang\estonian.lng"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\finnish.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating finnish language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					Outputs="lang\finnish.lng"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\french.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating french language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					Outputs="lang\french.lng"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\galician.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating galician language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					Outputs="lang\galician.lng"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\german.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating german language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					Outputs="lang\german.lng"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\hungarian.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating hungarian language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					Outputs="lang\hungarian.lng"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\icelandic.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating icelandic language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					Outputs="lang\icelandic.lng"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\italian.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating italian language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					Outputs="lang\italian.lng"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\lithuanian.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				ExcludedFromBuild="true"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating lithuanian language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					Outputs="lang\lithuanian.lng"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\norwegian.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating norwegian language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					Outputs="lang\norwegian.lng"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\origveh.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating Original Vehicle names file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					Outputs="lang\origveh.lng"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\polish.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating polish language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					Outputs="lang\polish.lng"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\portuguese.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating portuguese language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					Outputs="lang\portuguese.lng"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\romanian.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating romanian language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					Outputs="lang\romanian.lng"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\russian.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating russian language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					Outputs="lang\russian.lng"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\slovak.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating slovak language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					Outputs="lang\slovak.lng"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\spanish.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating spanish language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					Outputs="lang\spanish.lng"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="lang\swedish.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating swedish language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					Outputs="lang\swedish.lng"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\turkish.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating turkish language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					Outputs="lang\turkish.lng"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\lang\ukrainian.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating ukrainian language file"
-					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					Outputs="lang\ukrainian.lng"
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/makefiledir/Makefile.config_writer b/makefiledir/Makefile.config_writer
deleted file mode 100644
index a956d9e62..000000000
--- a/makefiledir/Makefile.config_writer
+++ /dev/null
@@ -1,111 +0,0 @@
-# This file generates Makefile.config
-# Create default config from autodetected values
-# Magic at work, note that you can't use commas in arguments for this
-CONFIG_LINE=@$(SHELL) -c 'echo $(1)' >> $(MAKE_CONFIG) 2> /dev/null
-
-$(MAKE_CONFIG):
-
-	touch $(MAKE_CONFIG)
-
-	$(call CONFIG_LINE,\# OpenTTD config file for makefile)
-	$(call CONFIG_LINE,\# Set your options here - 1 for use and empty for disable)
-	$(call CONFIG_LINE,)
-
-	$(call CONFIG_LINE,\# User setup flags)
-	$(call CONFIG_LINE,\# Translator: adds TODO to any untranslated strings)
-	$(call CONFIG_LINE,\# MIDI: sets path to midi player)
-	$(call CONFIG_LINE,\# MIDI_ARG: sets an argument which is used when calling the midi player. Default off)
-	$(call CONFIG_LINE,\# SUPRESS_LANG_ERRORS: supresses output about missing and mismatched strings)
-	$(call CONFIG_LINE,\# WITH_NETWORK: makes OpenTTD able to play multiplayer using TCP and UDP)
-	$(call CONFIG_LINE,\# DEDICATED: compiles a dedicated server. This one can only host using a CLI, but do not need SDL)
-	$(call CONFIG_LINE,STATIC:=$(STATIC))
-	$(call CONFIG_LINE,TRANSLATOR:=$(TRANSLATOR))
-	$(call CONFIG_LINE,DEBUG:=$(DEBUG))
-	$(call CONFIG_LINE,PROFILE:=$(PROFILE))
-	$(call CONFIG_LINE,MIDI:=$(MIDI))
-	$(call CONFIG_LINE,MIDI_ARG:=$(MIDI_ARG))
-	$(call CONFIG_LINE,SUPRESS_LANG_ERRORS:=$(SUPRESS_LANG_ERRORS))
-	$(call CONFIG_LINE,WITH_DIRECTMUSIC:=$(WITH_DIRECTMUSIC))
-	$(call CONFIG_LINE,WITH_NETWORK:=$(WITH_NETWORK))
-	$(call CONFIG_LINE,DEDICATED:=$(DEDICATED))
-	$(call CONFIG_LINE,)
-
-	$(call CONFIG_LINE,\# Disable asserts. Leave them on for easier bug finding)
-	$(call CONFIG_LINE,DISABLE_ASSERTS:=$(DISABLE_ASSERTS))
-	$(call CONFIG_LINE,\# Disable threads. Useful if you do not like it and for testing)
-	$(call CONFIG_LINE,NO_THREADS:=$(NO_THREADS))
-	$(call CONFIG_LINE,)
-
-	$(call CONFIG_LINE,\# See Makefile for details on these paths)
-	$(call CONFIG_LINE,\# Folders should not end with /)
-	$(call CONFIG_LINE,INSTALL:=$(INSTALL))
-	$(call CONFIG_LINE,PREFIX:=$(PREFIX))
-	$(call CONFIG_LINE,BINARY_DIR:=$(BINARY_DIR))
-	$(call CONFIG_LINE,DATA_DIR:=$(DATA_DIR))
-	$(call CONFIG_LINE,ICON_DIR:=$(ICON_DIR))
-	$(call CONFIG_LINE,USE_HOMEDIR:=$(USE_HOMEDIR))
-	$(call CONFIG_LINE,PERSONAL_DIR:=$(PERSONAL_DIR))
-	$(call CONFIG_LINE,SECOND_DATA_PATH:=$(SECOND_DATA_PATH))
-	$(call CONFIG_LINE,CUSTOM_LANG_PATH:=$(CUSTOM_LANG_PATH))
-	$(call CONFIG_LINE,)
-
-	$(call CONFIG_LINE,\# Flag to skip test for OS when building static)
-	$(call CONFIG_LINE,\# OpenTTD have only been succesfully tested with static builds on MorphOS and MacOSX)
-	$(call CONFIG_LINE,\# If you want to try anyway on other OSes, set this flag)
-	$(call CONFIG_LINE,\# Inform us if you have success)
-	$(call CONFIG_LINE,SKIP_STATIC_CHECK:=$(SKIP_STATIC_CHECK))
-	$(call CONFIG_LINE,)
-	$(call CONFIG_LINE,)
-
-	$(call CONFIG_LINE,\# Everything below this line is autogenerated)
-	$(call CONFIG_LINE,\#)
-	$(call CONFIG_LINE,\# If you need to change anything below, you should run "make upgradeconf")
-	$(call CONFIG_LINE,\# If that does not fix the problem, you should make a bug report.)
-	$(call CONFIG_LINE,\# It would really help if you could tell how to autodetect the missing setting)
-	$(call CONFIG_LINE,\# That info could be where the missing lib is placed)
-	$(call CONFIG_LINE,)
-
-	$(call CONFIG_LINE,\# Libs)
-	$(call CONFIG_LINE,WITH_ZLIB:=$(WITH_ZLIB))
-	$(call CONFIG_LINE,WITH_SDL:=$(WITH_SDL))
-	$(call CONFIG_LINE,WITH_PNG:=$(WITH_PNG))
-	$(call CONFIG_LINE,WITH_ICONV:=$(WITH_ICONV))
-	$(call CONFIG_LINE,WITH_ICONV_PATH:=$(WITH_ICONV_PATH))
-	$(call CONFIG_LINE,STATIC_ZLIB_PATH:=$(STATIC_ZLIB_PATH))
-	$(call CONFIG_LINE,WITH_COCOA:=$(WITH_COCOA))
-	$(call CONFIG_LINE,WITH_FREETYPE:=$(WITH_FREETYPE))
-	$(call CONFIG_LINE,WITH_FONTCONFIG:=$(WITH_FONTCONFIG))
-	$(call CONFIG_LINE,)
-
-	$(call CONFIG_LINE,\# OS flags)
-	$(call CONFIG_LINE,WIN32:=$(WIN32))
-	$(call CONFIG_LINE,UNIX:=$(UNIX))
-	$(call CONFIG_LINE,OSX:=$(OSX))
-	$(call CONFIG_LINE,FREEBSD:=$(FREEBSD))
-	$(call CONFIG_LINE,MORPHOS:=$(MORPHOS))
-	$(call CONFIG_LINE,BEOS:=$(BEOS))
-	$(call CONFIG_LINE,OS2:=$(OS2))
-	$(call CONFIG_LINE,SUNOS:=$(SUNOS))
-	$(call CONFIG_LINE,CYGWIN:=$(CYGWIN))
-	$(call CONFIG_LINE,MINGW:=$(MINGW))
-	$(call CONFIG_LINE,)
-
-	$(call CONFIG_LINE,\# For cross-compiling)
-	$(call CONFIG_LINE,CC_TARGET:=$(CC_TARGET))
-	$(call CONFIG_LINE,CC_HOST:=$(CC_HOST))
-	$(call CONFIG_LINE,CXX_TARGET:=$(CXX_TARGET))
-	$(call CONFIG_LINE,CXX_HOST:=$(CXX_HOST))
-	$(call CONFIG_LINE,CFLAGS_HOST:=$(CFLAGS_HOST))
-	$(call CONFIG_LINE,WINDRES:=$(WINDRES))
-	$(call CONFIG_LINE,ENDIAN_FORCE:=$(ENDIAN_FORCE))
-	$(call CONFIG_LINE,)
-
-	$(call CONFIG_LINE,\# misc)
-	$(call CONFIG_LINE,SDL_CONFIG:=$(SDL_CONFIG))
-	$(call CONFIG_LINE,LIBPNG_CONFIG:=$(LIBPNG_CONFIG))
-	$(call CONFIG_LINE,FREETYPE_CONFIG:=$(FREETYPE_CONFIG))
-	$(call CONFIG_LINE,FONTCONFIG_CONFIG:=$(FONTCONFIG_CONFIG))
-	$(call CONFIG_LINE,BEOS_NET_SERVER:=$(BEOS_NET_SERVER))
-	$(call CONFIG_LINE,CONFIG_INCLUDED:=yes)
-	$(call CONFIG_LINE,PATH_SET:=$(PATH_SET))
-	$(call CONFIG_LINE,CONFIG_VERSION:=$(MAKEFILE_VERSION))
diff --git a/makefiledir/Makefile.libdetection b/makefiledir/Makefile.libdetection
deleted file mode 100644
index eb38ffd47..000000000
--- a/makefiledir/Makefile.libdetection
+++ /dev/null
@@ -1,149 +0,0 @@
-# this file detects what OS and libs the computer have/are running
-
-ifndef CONFIG_VERSION
-CONFIG_VERSION:=0
-endif
-
-ifeq ($(shell expr $(CONFIG_VERSION) \< 9), 1)
-
-ifndef BYPASS_OS_DETECT
-
-# Automatically recognize if building on Win32
-ifdef WINDIR
-ifndef UNIX
-WIN32:=1
-CYGWIN:=1
-MINGW:=1
-STATIC:=1
-SKIP_STATIC_CHECK:=1
-endif
-else
-UNIX:=1
-endif
-
-# Automatically recognize if building on FreeBSD
-ifeq ($(shell uname),FreeBSD)
-FREEBSD:=1
-endif
-
-# Automatically recognize if building on MacOSX
-ifeq ($(shell uname), Darwin)
-OSX:=1
-# OSX uses the unix setup too
-UNIX:=1
-endif
-
-# Automatically recognize if building on MorphOS
-ifeq ($(shell uname), MorphOS)
-MORPHOS:=1
-# MorphOS uses UNIX setup too
-UNIX:=1
-endif
-
-# Automatically recognize if building on BeOS
-ifeq ($(shell uname), BeOS)
-BEOS:=1
-# BeOS uses UNIX setup too
-UNIX:=1
-# Except that in BeOS 5.0 we need to use net_server, not BONE networking
-ifeq ($(shell uname -r), 5.0)
-BEOS_NET_SERVER:=1
-endif
-endif
-
-# Automatically recognize if building on SunOS/Solaris
-ifeq ($(shell uname), SunOS)
-SUNOS:=1
-# SunOS uses UNIX setup too
-UNIX:=1
-endif
-
-# END BYPASS_OS_DETECT
-endif
-
-SDL_CONFIG:=sdl-config
-
-# set libpng-config to the default value
-LIBPNG_CONFIG :=libpng-config
-
-# set freetype-config to the default value
-FREETYPE_CONFIG:=freetype-config
-
-# set pkg-config to the default value
-FONTCONFIG_CONFIG:=pkg-config fontconfig
-
-# Networking, enabled by default
-WITH_NETWORK:=1
-
-# Library detections
-WITH_SDL:=$(shell $(SDL_CONFIG) --version 2>/dev/null)
-
-# libpng detection
-WITH_PNG:=$(shell $(LIBPNG_CONFIG) --version 2>/dev/null)
-
-# Freetype detection
-WITH_FREETYPE:=$(shell $(FREETYPE_CONFIG) --ftversion 2>/dev/null)
-
-# fontconfig detection
-WITH_FONTCONFIG:=$(shell $(FONTCONFIG_CONFIG) --modversion 2>/dev/null)
-
-ifdef WITH_PNG
-	# LibPNG depends on Zlib
-	WITH_ZLIB:=1
-else
-# We go looking for zlib with a little hack
-WITH_ZLIB:=$(shell ls /usr/include | grep "zlib.h" 2>/dev/null) \
-$(shell ls /usr/local/include | grep "zlib.h" 2>/dev/null)
-ifdef WITH_ZLIB
-WITH_ZLIB:=1
-endif
-endif
-
-ifdef WITH_ZLIB
-	TEMP:=$(shell ls /lib 2>/dev/null | grep "zlib.a")$(shell ls /lib 2>/dev/null | grep "libz.a")
-	ifdef TEMP
-		STATIC_ZLIB_PATH:=/lib/$(TEMP)
-	else
-		TEMP:=$(shell ls /usr/lib 2>/dev/null | grep "zlib.a")$(shell ls /usr/lib 2>/dev/null | grep "libz.a")
-		ifdef TEMP
-			STATIC_ZLIB_PATH:=/usr/lib/$(TEMP)
-		else
-			TEMP:=$(shell ls /usr/local/lib 2>/dev/null | grep "zlib.a")$(shell ls /usr/local/lib 2>/dev/null | grep "libz.a")
-			ifdef TEMP
-				STATIC_ZLIB_PATH:=/usr/local/lib/$(TEMP)
-			endif
-		endif
-	endif
-endif
-
-# sets the default paths
-ifdef UNIX
-ifndef OSX
-ifndef MORPHOS
-ifndef BIN_DIR
-#BINARY_DIR:=
-#DATA_DIR_PREFIX:=
-#INSTALL_DIR:=/usr/local/
-#USE_HOMEDIR:=
-endif
-endif
-endif
-endif
-
-ifdef OSX
-# we prefer to use cocoa drivers rather than SDL drivers
-# if you really want SDL drivers, you can always modify Makefile.config
-ifndef DEDICATED
-WITH_COCOA:=1
-WITH_SDL:=
-endif
-endif
-
-
-# workaround
-# cygwin have problems with libpng, so we will just disable it for now until the problem is solved
-ifdef CYGWIN
-WITH_PNG:=
-endif
-
-endif
diff --git a/mainicon.ico b/media/mainicon.ico
index 0770ed6c5..0770ed6c5 100644
--- a/mainicon.ico
+++ b/media/mainicon.ico
diff --git a/openttd.ico b/media/openttd.ico
index b2b12cab6..b2b12cab6 100644
--- a/openttd.ico
+++ b/media/openttd.ico
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>
diff --git a/openttd_vs80.vcproj b/openttd_vs80.vcproj
deleted file mode 100644
index 11daa722c..000000000
--- a/openttd_vs80.vcproj
+++ /dev/null
@@ -1,2026 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="openttd"
-	ProjectGUID="{668328A0-B40E-4CDB-BD72-D0064424414A}"
-	RootNamespace="openttd"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-		<ToolFile
-			RelativePath="masm64.rules"
-		/>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\$(ConfigurationName)\"
-			IntermediateDirectory=".\$(ConfigurationName)\"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="MASM AMD64"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Release/openttd.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				StructMemberAlignment="3"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				DefaultCharIsUnsigned="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderThrough=""
-				PrecompiledHeaderFile=""
-				AssemblerOutput="2"
-				AssemblerListingLocation=".\$(ConfigurationName)\"
-				ObjectFile=".\$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\$(ConfigurationName)\"
-				BrowseInformation="1"
-				WarningLevel="3"
-				WarnAsError="true"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CallingConvention="1"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1053"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib"
-				OutputFile=".\$(ConfigurationName)\openttd.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				IgnoreDefaultLibraryNames=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\$(ConfigurationName)\openttd.pdb"
-				SubSystem="2"
-				OptimizeReferences="2"
-				OptimizeForWindows98="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="MASM AMD64"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-				TypeLibraryName=".\Release/openttd.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				StructMemberAlignment="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				DefaultCharIsUnsigned="true"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderThrough=""
-				PrecompiledHeaderFile=""
-				AssemblerOutput="2"
-				AssemblerListingLocation=".\$(ConfigurationName)\"
-				ObjectFile=".\$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\$(ConfigurationName)\"
-				BrowseInformation="1"
-				WarningLevel="3"
-				WarnAsError="false"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CallingConvention="1"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1053"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib"
-				OutputFile=".\$(PlatformName)\$(ConfigurationName)\openttd.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				IgnoreDefaultLibraryNames=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\$(ConfigurationName)\openttd.pdb"
-				SubSystem="2"
-				OptimizeReferences="2"
-				OptimizeForWindows98="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\$(ConfigurationName)\"
-			IntermediateDirectory=".\$(ConfigurationName)\"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="MASM AMD64"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Debug/openttd.tlb"
-				HeaderFileName=""
-			/>
-			<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="0"
-				PrecompiledHeaderThrough=""
-				PrecompiledHeaderFile=""
-				AssemblerListingLocation=".\$(ConfigurationName)\"
-				ObjectFile=".\$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\$(ConfigurationName)\"
-				WarningLevel="3"
-				WarnAsError="true"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-				CallingConvention="1"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1053"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib"
-				OutputFile=".\$(ConfigurationName)\openttd.exe"
-				LinkIncremental="0"
-				SuppressStartupBanner="true"
-				IgnoreDefaultLibraryNames="LIBCMT.lib"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\$(ConfigurationName)\openttd.pdb"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="MASM AMD64"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-				TypeLibraryName=".\Debug/openttd.tlb"
-				HeaderFileName=""
-			/>
-			<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="0"
-				PrecompiledHeaderThrough=""
-				PrecompiledHeaderFile=""
-				AssemblerListingLocation=".\$(ConfigurationName)\"
-				ObjectFile=".\$(ConfigurationName)\"
-				ProgramDataBaseFileName=".\$(ConfigurationName)\"
-				WarningLevel="3"
-				WarnAsError="false"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1053"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib"
-				OutputFile=".\$(PlatformName)\$(ConfigurationName)\openttd.exe"
-				LinkIncremental="0"
-				SuppressStartupBanner="true"
-				IgnoreDefaultLibraryNames="LIBCMT.lib"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\$(ConfigurationName)\openttd.pdb"
-				SubSystem="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</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="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="2"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="2"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<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="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="2"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="2"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<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=".\win64.asm"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="MASM AMD64"
-						PreserveIdentifierCase="true"
-						PreservePublicAndExternSymbolCase="true"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="MASM AMD64"
-						PreserveIdentifierCase="true"
-						PreservePublicAndExternSymbolCase="true"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\window.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-			<File
-				RelativePath=".win32.h"
-				>
-			</File>
-			<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=".\clear.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=".\direction.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=".\networe\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\network_server.h"
-				>
-			</File>
-			<File
-				RelativePath=".\network\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=".\road.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=".\void.h"
-				>
-			</File>
-			<File
-				RelativePath=".\waypoint.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"
-			>
-			<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"
-			>
-			<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"
-			>
-			<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"
-			>
-			<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"
-				>
-				<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"
-			>
-			<File
-				RelativePath=".\bridge_map.c"
-				>
-			</File>
-			<File
-				RelativePath=".\bridge_map.h"
-				>
-			</File>
-			<File
-				RelativePath=".\clear_map.h"
-				>
-			</File>
-			<File
-				RelativePath=".\elrail.c"
-				>
-			</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"
-			>
-			<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="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="2"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="2"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<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="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="2"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="2"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<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="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="2"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="2"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<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="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="2"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="2"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<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="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="2"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="2"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<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>
diff --git a/os/macosx/Makefile b/os/macosx/Makefile
deleted file mode 100644
index d8afef98c..000000000
--- a/os/macosx/Makefile
+++ /dev/null
@@ -1,146 +0,0 @@
-# $Id: Makefile 3214 2005-11-17 19:43:37Z bjarni $
-# This makefile is not a standalone makefile, but is called from the general one
-# it contains targets specific to MacOS X
-
-ifdef MACOSX_BUILD
-
-DEPS_MAGIC := $(shell mkdir -p $(sort $(dir $(OBJS:%.o=.OSX/%))))
-
-ifdef OTTD_PPC
-OTTD_PPC    :=.OSX/openttd.ppc
-OBJS_ppc    := $(OBJS:%.o=.OSX/%.o.ppc)
-ifndef CC_PPC
-CC_PPC      := $(CC) -arch ppc
-endif
-ifndef CXX_PPC
-CXX_PPC     := $(CXX) -arch ppc
-endif
-endif
-
-ifdef OTTD_i386
-OTTD_i386   :=.OSX/openttd.i386
-OBJS_i386   := $(OBJS:%.o=.OSX/%.o.i386)
-ifndef CC_I386
-CC_I386     := $(CC) -arch i386
-endif
-ifndef CXX_I386
-CXX_I386    := $(CXX) -arch i386
-endif
-endif
-
-ifdef OTTD_PPC970
-OTTD_PPC970 :=.OSX/openttd.ppc970
-OBJS_ppc970 := $(OBJS:%.o=.OSX/%.o.ppc970)
-ifndef CC_PPC970
-CC_PPC970   := $(CC) -arch ppc970
-endif
-ifndef CXX_PPC970
-CXX_PPC970  := $(CXX) -arch ppc970
-endif
-endif
-
-ifndef LIPO
-LIPO := lipo
-endif
-ifndef STRIP
-STRIP := strip
-endif
-
-# targets to link OpenTTD
-$(TTD): $(OTTD_PPC) $(OTTD_i386) $(OTTD_PPC970)
-	@echo '===> Linking $@ into a single file'
-	$(Q)$(LIPO) -create -output $@ $(OTTD_PPC) $(OTTD_i386) $(OTTD_PPC970)
-
-$(OTTD_PPC): $(MAKE_CONFIG) $(OBJS_ppc)
-	@echo '[PowerPC] Linking $(TTD)'
-	$(Q)$(CXX_PPC) $(LDFLAGS) $(TTDLDFLAGS) $(OBJS_ppc) $(LIBS) $(LDFLAGS_PPC) -o $@
-
-$(OTTD_i386): $(MAKE_CONFIG) $(OBJS_i386)
-	@echo '[i386] Linking $(TTD)'
-	$(Q)$(CXX_I386) $(LDFLAGS) $(TTDLDFLAGS) $(OBJS_i386) $(LIBS) $(LDFLAGS_i386) -o $@
-
-$(OTTD_PPC970): $(MAKE_CONFIG) $(OBJS_ppc970)
-	@echo '[PowerPC G5] Linking $(TTD)'
-	$(Q)$(CXX_PPC970) $(LDFLAGS) $(TTDLDFLAGS) $(OBJS_ppc970) $(LIBS) $(LDFLAGS_PPC) $(G5_FLAGS) -o $@
-
-# targets to compile each c, m and cpp file
-.OSX/%.o.ppc: %.c      .deps/%.d
-	@echo '[PowerPC] Compiling $<'
-	$(Q)$(CC_PPC) $(CC_CFLAGS) $(CFLAGS) $(CFLAGS_PPC) $(CDEFS) -c -o $@ $<
-
-.OSX/%.o.ppc: %.cpp    .deps/%.d
-	@echo '[PowerPC] Compiling $<'
-	$(Q)$(CXX_PPC) $(CFLAGS) $(CFLAGS_PPC) $(CDEFS) -c -o $@ $<
-
-.OSX/%.o.ppc: %.m      .deps/%.d
-	@echo '[PowerPC] Compiling $<'
-	$(Q)$(CC_PPC) $(CC_CFLAGS) $(CFLAGS) $(CFLAGS_PPC) $(CDEFS) -c -o $@ $<
-
-.OSX/%.o.i386: %.c     .deps/%.d
-	@echo '[i386] Compiling $<'
-	$(Q)$(CC_I386) $(CC_CFLAGS) $(CFLAGS) $(CFLAGS_i386) $(CDEFS) -c -o $@ $<
-
-.OSX/%.o.i386: %.cpp   .deps/%.d
-	@echo '[i386] Compiling $<'
-	$(Q)$(CXX_I386) $(CFLAGS) $(CFLAGS_i386) $(CDEFS) -c -o $@ $<
-
-.OSX/%.o.i386: %.m     .deps/%.d
-	@echo '[i386] Compiling $<'
-	$(Q)$(CC_I386) $(CC_CFLAGS) $(CFLAGS) $(CFLAGS_i386) $(CDEFS) -c -o $@ $<
-
-.OSX/%.o.ppc970: %.c   .deps/%.d
-	@echo '[PowerPC G5] Compiling $<'
-	$(Q)$(CC_PPC970) $(CC_CFLAGS) $(CFLAGS) $(CFLAGS_PPC) $(G5_FLAGS) $(CDEFS) -c -o $@ $<
-
-.OSX/%.o.ppc970: %.cpp .deps/%.d
-	@echo '[PowerPC G5] Compiling $<'
-	$(Q)$(CXX_PPC970) $(CFLAGS) $(CFLAGS_PPC) $(G5_FLAGS) $(CDEFS) -c -o $@ $<
-
-.OSX/%.o.ppc970: %.m   .deps/%.d
-	@echo '[PowerPC G5] Compiling $<'
-	$(Q)$(CC_PPC970) $(CC_CFLAGS) $(CFLAGS) $(CFLAGS_PPC) $(G5_FLAGS) $(CDEFS) -c -o $@ $<
-
-endif
-
-# manual strip, as the -s option fails
-$(OSX_STRIP): $(TTD)
-	$(Q)$(STRIP) openttd
-
-
-# build the bundle. OSX wants to keep apps in bundles, so we will give it one
-# the good thing about bundles is that you can keep extra files in them, so we keep lng files and a data dir in it
-
-BUILD_OSX_BUNDLE: $(TTD) $(OSX_STRIP)
-	@echo '===> Building application bundle'
-	$(Q)rm -fr "$(OSXAPP)"
-	$(Q)mkdir -p "$(OSXAPP)"/Contents/MacOS
-	$(Q)mkdir -p "$(OSXAPP)"/Contents/Resources
-	$(Q)mkdir -p "$(OSXAPP)"/Contents/Data
-	$(Q)mkdir -p "$(OSXAPP)"/Contents/Lang
-	$(Q)echo "APPL????" > "$(OSXAPP)"/Contents/PkgInfo
-	$(Q)cp os/macosx/openttd.icns "$(OSXAPP)"/Contents/Resources/openttd.icns
-	$(Q)os/macosx/plistgen.sh "$(OSXAPP)" "$(REV)"
-	$(Q)cp -R data/* "$(OSXAPP)"/Contents/Data/
-	$(Q)cp os/macosx/splash.png "$(OSXAPP)"/Contents/Data/
-	$(Q)cp lang/*.lng "$(OSXAPP)"/Contents/Lang/
-	$(Q)cp $(TTD) "$(OSXAPP)"/Contents/MacOS/$(TTD)
-
-# make the release disk image. Should only be used with releases and is a good and fast way to make sure to remember all the needed files
-release: all
-	@echo '===> Building release disk image'
-	$(Q)mkdir -p "OpenTTD $(REV)"
-	$(Q)mkdir -p "OpenTTD $(REV)/docs"
-	$(Q)mkdir -p "OpenTTD $(REV)/scenario"
-	$(Q)cp -R $(OSXAPP) "OpenTTD $(REV)/"
-	$(Q)cp docs/OSX_install_instructions.txt "OpenTTD $(REV)/How to install (please read).txt"
-	$(Q)cp readme.txt "OpenTTD $(REV)/docs/"
-	$(Q)cp COPYING "OpenTTD $(REV)/docs/"
-	$(Q)cp changelog.txt "OpenTTD $(REV)/docs/"
-	$(Q)cp known-bugs.txt "OpenTTD $(REV)/known-bugs.txt"
-	$(Q)cp -R scenario/* "OpenTTD $(REV)/scenario/"
-	$(Q)hdiutil create -ov -format UDZO -srcfolder "OpenTTD $(REV)" openttd-"$(REV)"-osx.dmg
-	$(Q)rm -fr "OpenTTD $(REV)"
-
-$(OSX): $(TTD) $(OSX_STRIP) BUILD_OSX_BUNDLE
-
-.PHONY: release BUILD_OSX_BUNDLE
diff --git a/os/macosx/Makefile.setup b/os/macosx/Makefile.setup
deleted file mode 100644
index 38565ced3..000000000
--- a/os/macosx/Makefile.setup
+++ /dev/null
@@ -1,131 +0,0 @@
-# $Id: Makefile 3214 2005-11-17 19:43:37Z bjarni $
-# This makefile is not a standalone makefile, but is called from the general one
-# it contains code specific to MacOS X
-
-ifdef RELEASE
-ifndef STATIC
-# all OSX releases needs to be static
-# end users don't tend to have the dynamic libs installed
-$(warning Compiling a dynamic release. It should be static unless you really know what you are doing!!!)
-endif
-endif
-
-ifdef RELEASE
-ifndef UNIVERSAL_BINARY
-$(warning Compiling a release build, that is not a universal binary)
-endif
-endif
-
-ifdef TRIPLE_BINARY
-ifdef DEBUG
-$(error no G5 optimisation is made in debug builds, so triple binaries aren't possible. Use UNIVERSAL_BINARY instead if you really want a universal debug build)
-endif
-UNIVERSAL_BINARY:=1
-endif
-
-ifdef UNIVERSAL_BINARY
-ifndef STATIC
-$(warning Compiling a universal binary, that is not static. Adding static flag)
-STATIC:=1
-endif
-endif
-
-ifdef RELEASE
-ifdef DEBUG
-$(warning Compiling a release build, that is a debug build)
-endif
-endif
-
-ifeq ($(shell uname), Darwin)
-	# it's a hardware mac, not crosscompiling
-	ifeq ($(shell uname -r), 6.8)
-	# OSX 10.2.8 uses Darwin 6.8, so we better set JAGUAR so we avoid the stuff that was added in 10.3 or later
-$(error OpenTTD can not run or compile on MacOS X 10.2. 10.3.9 or newer is needed)
-	endif
-	NATIVE_OSX:=1
-endif
-
-ifndef PPC_OSX_TARGET
-PPC_OSX_TARGET:=10.3.9
-endif
-ifndef i386_OSX_TARGET
-i386_OSX_TARGET:=10.4u
-endif
-
-# 4-byte bools to make YAPF happy
-CFLAGS_PPC += -DFOUR_BYTE_BOOL
-
-ifndef G5_FLAGS
-G5_FLAGS := -mtune=970 -mcpu=970 -mpowerpc-gpopt
-endif
-
-ifdef UNIVERSAL_BINARY
-	OTTD_PPC:=1
-	OTTD_i386:=1
-	ifdef TRIPLE_BINARY
-		OTTD_PPC970:=1
-	endif
-endif
-
-# if any targets have been defined by now, we are crosscompiling and we will set up paths accordingly
-ifdef OTTD_PPC
-	ifndef OSX_NO_SYSROOT
-		CFLAGS_PPC   += -isysroot /Developer/SDKs/MacOSX$(PPC_OSX_TARGET).sdk
-		LDFLAGS_PPC  += -Wl,-syslibroot,/Developer/SDKs/MacOSX$(PPC_OSX_TARGET).sdk
-	endif
-endif
-
-ifdef OTTD_i386
-	ifndef OSX_NO_SYSROOT
-		CFLAGS_i386  += -isysroot /Developer/SDKs/MacOSX$(i386_OSX_TARGET).sdk
-		LDFLAGS_i386 += -Wl,-syslibroot,/Developer/SDKs/MacOSX$(i386_OSX_TARGET).sdk
-	endif
-endif
-
-ifdef OTTD_PPC970
-	ifndef OTTD_PPC
-		CFLAGS_PPC   += -isysroot /Developer/SDKs/MacOSX$(PPC_OSX_TARGET).sdk
-		LDFLAGS_PPC  += -Wl,-syslibroot,/Developer/SDKs/MacOSX$(PPC_OSX_TARGET).sdk
-	endif
-endif
-
-# setting up flags to make a binary, that fits the system it builds on
-ifdef NATIVE_OSX
-	ifndef UNIVERSAL_BINARY
-		# we are not crosscompiling for other macs
-		# the next line fails if it got whitespace in front of it
-$(shell $(CC) os/macosx/G5_detector.c -o os/macosx/G5_detector)
-		IS_G5:=$(shell os/macosx/G5_detector)
-	endif
-endif
-
-ifdef NATIVE_OSX
-	ifndef OTTD_PPC
-		ifndef OTTD_i386
-			ifndef OTTD_PPC970
-				# no flags have been set for target versions of OSX, so we will set it to compile for the current host
-				ifeq ($(shell uname -p), powerpc)
-					ifdef IS_G5
-						OTTD_PPC970:=1
-					else
-						OTTD_PPC:=1
-					endif
-				else
-					# we are not using a PowerPC CPU, so we assume that it's an Intel mac
-					OTTD_i386:=1
-				endif
-			endif
-		endif
-	endif
-endif
-
-ifdef OTTD_PPC
-MACOSX_BUILD:=1
-endif
-ifdef OTTD_i386
-MACOSX_BUILD:=1
-endif
-ifdef OTTD_PPC970
-MACOSX_BUILD:=1
-endif
-
diff --git a/projects/generate b/projects/generate
new file mode 100755
index 000000000..da431a901
--- /dev/null
+++ b/projects/generate
@@ -0,0 +1,158 @@
+#!/bin/bash
+
+# This file generates all project files based on sources.list, so everyone who
+#  can start a bash process, can update the project files.
+
+ROOT_DIR="`pwd`/.."
+if ! [ -e "$ROOT_DIR/source.list" ]
+then
+	ROOT_DIR="`pwd`"
+fi
+if ! [ -e "$ROOT_DIR/source.list" ]
+then
+	echo "Can't find source.list, needed in order to make this run. Please go to either"
+	echo " the project dir, or the root dir of a clean SVN checkout."
+	exit 1
+fi
+
+# openttd_vs80.sln    is for MSVC 2005
+# openttd_vs80.vcproj is for MSVC 2005
+# langs_vs80.vcproj   is for MSVC 2005
+# strgen_vs80.vcprojc is vor MSVC 2005
+
+# openttd.sln         is for MSVC 2003
+# openttd.vcproj      is for MSVC 2003
+# langs.vcproj        is for MSVC 2003
+# strgen.vcproj       is for MSVC 2003
+
+# openttd.tgt         is for WatCom
+
+
+
+# First, collect the list of Windows files
+sdl_config="1"
+os="MSVC"
+enable_dedicated="0"
+with_cocoa="0"
+enable_directmusic="1"
+file_prefix="..\\\\src\\\\"
+
+load_main_data() {
+	# Read the source.list and process it
+	RES="`awk '
+		/^(	*)#end/  { if (deep == skip) { skip -= 1; } deep -= 1; next; }
+		/^(	*)#else/ { if (deep == skip) { skip -= 1; } else if (deep - 1 == skip) { skip += 1; } next; }
+		/^(	*)#if/   {
+			gsub("	", "", $0);
+			gsub("^#if", "", $0);
+			gsub("^ ", "", $0);
+
+			if (deep != skip) { deep += 1; next; }
+
+			deep += 1;
+
+			if ($0 == "SDL"         && "'$sdl_config'" == "")          { next; }
+			if ($0 == "OSX"         && "'$os'" != "OSX")               { next; }
+			if ($0 == "DEDICATED"   && "'$enable_dedicated'" != "1")   { next; }
+			if ($0 == "COCOA"       && "'$with_cocoa'" == "0")         { next; }
+			if ($0 == "BEOS"        && "'$os'" != "BEOS")              { next; }
+			if ($0 == "WIN32"       && "'$os'" != "MINGW" &&
+											"'$os'" != "CYGWIN" && "'$os'" != "MSVC" ) { next; }
+			if ($0 == "MSVC"        && "'$os'" != "MSVC")              { next; }
+			if ($0 == "DIRECTMUSIC" && "'$enable_directmusic'" != "1") { next; }
+
+			skip += 1;
+
+			next;
+		}
+		/^(	*)#/ {
+			if (deep == skip) {
+				gsub("	", "", $0);
+				gsub("^#", "", $0);
+				gsub("^ ", "", $0);
+
+				if (first_time != 0) {
+					print "		</Filter>";
+				} else {
+					first_time = 1;
+				}
+
+				print "		<Filter";
+				print "			Name=\\""$0"\\"";
+				print "			Filter=\\"\\">";
+			}
+
+			next;
+		}
+		/^$/ { next }
+		{
+			if (deep == skip) {
+				gsub("	", "", $0);
+				gsub("/", "\\\\", $0);
+				print "			<File";
+				print "				RelativePath=\\".\\\\'$file_prefix'"$0"\\">";
+				print "			</File>";
+			}
+		}
+		END { print "		</Filter>"; }
+	' < $1`"
+
+	eval "$2=\"\$RES\""
+}
+
+load_lang_data() {
+	RES=""
+	for i in `ls $1`
+	do
+		i=`basename $i | sed s/.txt$//g`
+		RES="$RES
+		<File
+			RelativePath=\"..\\src\\lang\\"$i".txt\"
+			>
+			<FileConfiguration
+				Name=\"Debug|Win32\">
+				<Tool
+					Name=\"VCCustomBuildTool\"
+					Description=\"Generating "$i" language file\"
+					CommandLine=\"..\\objs\\strgen\\strgen.exe -s ..\\src\\lang -d ..\\bin\\lang &quot;\$(InputPath)&quot;&#x0D;&#x0A;\"
+					AdditionalDependencies=\"\"
+					Outputs=\"..\\bin\\lang\\"$i".lng\"
+				/>
+			</FileConfiguration>
+		</File>"
+	done
+
+	eval "$2=\"\$RES\""
+}
+
+generate() {
+	echo "Generating $2..."
+	# Everything above the !!FILES!! marker
+	RES="`awk '
+		/!!FILES!!/ { stop = 1; }
+		{
+			if (stop == 0) { print $0 }
+		}
+	' < \"$ROOT_DIR/projects/$2\".in > \"$ROOT_DIR/projects/$2\"`"
+
+	# The files-list
+	echo "$1" >> "$ROOT_DIR/projects/$2"
+
+	# Everything below the !!FILES!! marker
+	RES="`awk '
+		BEGIN { stop = 1; }
+		/!!FILES!!/ { stop = 2; }
+		{
+			if (stop == 0) { print $0 }
+			if (stop == 2) { stop = 0 }
+		}
+	' < \"$ROOT_DIR/projects/$2.in\" >> \"$ROOT_DIR/projects/$2\"`"
+}
+
+load_main_data "$ROOT_DIR/source.list" openttd
+load_lang_data "$ROOT_DIR/src/lang/*.txt" lang
+
+generate "$openttd" "openttd.vcproj"
+generate "$openttd" "openttd_vs80.vcproj"
+generate "$lang" "langs_vs80.vcproj"
+generate "$lang" "langs.vcproj"
diff --git a/projects/langs.vcproj b/projects/langs.vcproj
new file mode 100644
index 000000000..b2f2b90dd
--- /dev/null
+++ b/projects/langs.vcproj
@@ -0,0 +1,436 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="langs"
+	ProjectGUID="{0F066B23-18DF-4284-8265-F4A5E7E3B966}"
+	RootNamespace="langs"
+	SccProjectName=""
+	SccLocalPath=""
+	Keyword="MakeFileProj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\bin\lang\"
+			IntermediateDirectory="..\objs\langs\"
+			ConfigurationType="10"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName="./langs.tlb"
+				HeaderFileName=""/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"
+				Description="Generating strings.h"
+				CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\objs\langs\table"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+
+		<File
+			RelativePath="..\src\lang\american.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating american language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\american.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\brazilian_portuguese.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating brazilian_portuguese language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\brazilian_portuguese.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\bulgarian.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating bulgarian language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\bulgarian.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\catalan.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating catalan language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\catalan.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\czech.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating czech language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\czech.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\danish.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating danish language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\danish.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\dutch.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating dutch language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\dutch.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\english.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating english language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\english.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\esperanto.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating esperanto language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\esperanto.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\estonian.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating estonian language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\estonian.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\finnish.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating finnish language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\finnish.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\french.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating french language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\french.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\galician.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating galician language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\galician.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\german.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating german language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\german.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\hungarian.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating hungarian language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\hungarian.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\icelandic.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating icelandic language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\icelandic.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\italian.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating italian language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\italian.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\norwegian.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating norwegian language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\norwegian.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\origveh.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating origveh language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\origveh.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\polish.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating polish language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\polish.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\portuguese.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating portuguese language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\portuguese.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\romanian.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating romanian language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\romanian.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\russian.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating russian language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\russian.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\slovak.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating slovak language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\slovak.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\spanish.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating spanish language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\spanish.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\swedish.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating swedish language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\swedish.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\turkish.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating turkish language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\turkish.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\ukrainian.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating ukrainian language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\ukrainian.lng"
+				/>
+			</FileConfiguration>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/projects/langs.vcproj.in b/projects/langs.vcproj.in
new file mode 100644
index 000000000..e1bcf36d5
--- /dev/null
+++ b/projects/langs.vcproj.in
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="langs"
+	ProjectGUID="{0F066B23-18DF-4284-8265-F4A5E7E3B966}"
+	RootNamespace="langs"
+	SccProjectName=""
+	SccLocalPath=""
+	Keyword="MakeFileProj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\bin\lang\"
+			IntermediateDirectory="..\objs\langs\"
+			ConfigurationType="10"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName="./langs.tlb"
+				HeaderFileName=""/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"
+				Description="Generating strings.h"
+				CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\objs\langs\table"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+!!FILES!!
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/projects/langs_vs80.vcproj b/projects/langs_vs80.vcproj
new file mode 100644
index 000000000..dbcd37086
--- /dev/null
+++ b/projects/langs_vs80.vcproj
@@ -0,0 +1,444 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="langs"
+	ProjectGUID="{0F066B23-18DF-4284-8265-F4A5E7E3B966}"
+	RootNamespace="langs"
+	Keyword="MakeFileProj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\bin\lang"
+			IntermediateDirectory="..\objs\langs"
+			ConfigurationType="10"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName="./langs.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<Tool
+				Name="VCPreBuildEventTool"
+				Description="Generating strings.h"
+				CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\objs\langs\table"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+
+		<File
+			RelativePath="..\src\lang\american.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating american language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\american.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\brazilian_portuguese.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating brazilian_portuguese language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\brazilian_portuguese.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\bulgarian.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating bulgarian language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\bulgarian.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\catalan.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating catalan language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\catalan.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\czech.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating czech language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\czech.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\danish.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating danish language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\danish.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\dutch.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating dutch language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\dutch.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\english.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating english language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\english.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\esperanto.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating esperanto language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\esperanto.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\estonian.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating estonian language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\estonian.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\finnish.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating finnish language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\finnish.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\french.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating french language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\french.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\galician.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating galician language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\galician.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\german.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating german language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\german.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\hungarian.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating hungarian language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\hungarian.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\icelandic.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating icelandic language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\icelandic.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\italian.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating italian language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\italian.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\norwegian.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating norwegian language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\norwegian.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\origveh.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating origveh language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\origveh.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\polish.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating polish language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\polish.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\portuguese.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating portuguese language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\portuguese.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\romanian.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating romanian language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\romanian.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\russian.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating russian language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\russian.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\slovak.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating slovak language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\slovak.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\spanish.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating spanish language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\spanish.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\swedish.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating swedish language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\swedish.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\turkish.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating turkish language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\turkish.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\lang\ukrainian.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating ukrainian language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\ukrainian.lng"
+				/>
+			</FileConfiguration>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/projects/langs_vs80.vcproj.in b/projects/langs_vs80.vcproj.in
new file mode 100644
index 000000000..8cbc5467a
--- /dev/null
+++ b/projects/langs_vs80.vcproj.in
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="langs"
+	ProjectGUID="{0F066B23-18DF-4284-8265-F4A5E7E3B966}"
+	RootNamespace="langs"
+	Keyword="MakeFileProj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\bin\lang"
+			IntermediateDirectory="..\objs\langs"
+			ConfigurationType="10"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName="./langs.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<Tool
+				Name="VCPreBuildEventTool"
+				Description="Generating strings.h"
+				CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\objs\langs\table"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+!!FILES!!
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/openttd.sln b/projects/openttd.sln
index c8072d9e9..15c930e2a 100644
--- a/openttd.sln
+++ b/projects/openttd.sln
@@ -1,5 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "strgen", "strgen\strgen.vcproj", "{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "strgen", "strgen.vcproj", "{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
@@ -19,11 +19,13 @@ Global
 		Debug = Debug
 		Release = Release
 	EndGlobalSection
+	GlobalSection(ProjectDependencies) = postSolution
+	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
-		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug.ActiveCfg = Debug|Win32
-		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug.Build.0 = Debug|Win32
-		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release.ActiveCfg = Debug|Win32
-		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release.Build.0 = Debug|Win32
+		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug.ActiveCfg = Release|Win32
+		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug.Build.0 = Release|Win32
+		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release.ActiveCfg = Release|Win32
+		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release.Build.0 = Release|Win32
 		{668328A0-B40E-4CDB-BD72-D0064424414A}.Debug.ActiveCfg = Debug|Win32
 		{668328A0-B40E-4CDB-BD72-D0064424414A}.Debug.Build.0 = Debug|Win32
 		{668328A0-B40E-4CDB-BD72-D0064424414A}.Release.ActiveCfg = Release|Win32
diff --git a/openttd.tgt b/projects/openttd.tgt
index dc2c11089..dc2c11089 100644
--- a/openttd.tgt
+++ b/projects/openttd.tgt
diff --git a/projects/openttd.vcproj b/projects/openttd.vcproj
new file mode 100644
index 000000000..ce32fc9fe
--- /dev/null
+++ b/projects/openttd.vcproj
@@ -0,0 +1,1138 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="openttd"
+	RootNameSpace="openttd"
+	SccProjectName=""
+	SccLocalPath="">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\objs\$(ConfigurationName)"
+			IntermediateDirectory="..\objs\$(ConfigurationName)"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2"
+			WholeProgramOptimization="TRUE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				GlobalOptimizations="TRUE"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="TRUE"
+				FavorSizeOrSpeed="2"
+				OmitFramePointers="TRUE"
+				OptimizeForProcessor="1"
+				AdditionalIncludeDirectories="..\objs\langs"
+				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="$(IntDir)/"
+				ObjectFile="$(IntDir)/"
+				ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"
+				BrowseInformation="1"
+				BrowseInformationFile="$(IntDir)/"
+				WarningLevel="3"
+				WarnAsError="TRUE"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="3"
+				CallingConvention="1"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="unicows.lib winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				IgnoreDefaultLibraryNames=""
+				GenerateDebugInformation="TRUE"
+				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="..\objs\$(ConfigurationName)\"
+			IntermediateDirectory="..\objs\$(ConfigurationName)\"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="1">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\objs\langs"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				AssemblerListingLocation="$(IntDir)/"
+				ObjectFile="$(IntDir)/"
+				ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"
+				WarningLevel="3"
+				WarnAsError="TRUE"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="4"
+				CallingConvention="1"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="unicows.lib winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib"
+				LinkIncremental="0"
+				SuppressStartupBanner="TRUE"
+				IgnoreDefaultLibraryNames="LIBCMT.lib"
+				GenerateDebugInformation="TRUE"
+				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="">
+			<File
+				RelativePath=".\..\src\airport.c">
+			</File>
+			<File
+				RelativePath=".\..\src\aystar.c">
+			</File>
+			<File
+				RelativePath=".\..\src\bmp.c">
+			</File>
+			<File
+				RelativePath=".\..\src\callback_table.c">
+			</File>
+			<File
+				RelativePath=".\..\src\command.c">
+			</File>
+			<File
+				RelativePath=".\..\src\console.c">
+			</File>
+			<File
+				RelativePath=".\..\src\console_cmds.c">
+			</File>
+			<File
+				RelativePath=".\..\src\currency.c">
+			</File>
+			<File
+				RelativePath=".\..\src\date.c">
+			</File>
+			<File
+				RelativePath=".\..\src\debug.c">
+			</File>
+			<File
+				RelativePath=".\..\src\dedicated.c">
+			</File>
+			<File
+				RelativePath=".\..\src\depot.c">
+			</File>
+			<File
+				RelativePath=".\..\src\driver.c">
+			</File>
+			<File
+				RelativePath=".\..\src\economy.c">
+			</File>
+			<File
+				RelativePath=".\..\src\elrail.c">
+			</File>
+			<File
+				RelativePath=".\..\src\engine.c">
+			</File>
+			<File
+				RelativePath=".\..\src\fileio.c">
+			</File>
+			<File
+				RelativePath=".\..\src\fios.c">
+			</File>
+			<File
+				RelativePath=".\..\src\fontcache.c">
+			</File>
+			<File
+				RelativePath=".\..\src\genworld.c">
+			</File>
+			<File
+				RelativePath=".\..\src\gfx.c">
+			</File>
+			<File
+				RelativePath=".\..\src\gfxinit.c">
+			</File>
+			<File
+				RelativePath=".\..\src\heightmap.c">
+			</File>
+			<File
+				RelativePath=".\..\src\helpers.cpp">
+			</File>
+			<File
+				RelativePath=".\..\src\landscape.c">
+			</File>
+			<File
+				RelativePath=".\..\src\map.c">
+			</File>
+			<File
+				RelativePath=".\..\src\md5.c">
+			</File>
+			<File
+				RelativePath=".\..\src\mersenne.c">
+			</File>
+			<File
+				RelativePath=".\..\src\minilzo.c">
+			</File>
+			<File
+				RelativePath=".\..\src\misc.c">
+			</File>
+			<File
+				RelativePath=".\..\src\mixer.c">
+			</File>
+			<File
+				RelativePath=".\..\src\music.c">
+			</File>
+			<File
+				RelativePath=".\..\src\namegen.c">
+			</File>
+			<File
+				RelativePath=".\..\src\network\core\packet.c">
+			</File>
+			<File
+				RelativePath=".\..\src\network\core\tcp.c">
+			</File>
+			<File
+				RelativePath=".\..\src\network\core\udp.c">
+			</File>
+			<File
+				RelativePath=".\..\src\network\network.c">
+			</File>
+			<File
+				RelativePath=".\..\src\network\network_client.c">
+			</File>
+			<File
+				RelativePath=".\..\src\network\network_data.c">
+			</File>
+			<File
+				RelativePath=".\..\src\network\network_gamelist.c">
+			</File>
+			<File
+				RelativePath=".\..\src\network\network_server.c">
+			</File>
+			<File
+				RelativePath=".\..\src\network\network_udp.c">
+			</File>
+			<File
+				RelativePath=".\..\src\npf.c">
+			</File>
+			<File
+				RelativePath=".\..\src\oldloader.c">
+			</File>
+			<File
+				RelativePath=".\..\src\oldpool.c">
+			</File>
+			<File
+				RelativePath=".\..\src\openttd.c">
+			</File>
+			<File
+				RelativePath=".\..\src\os_timer.c">
+			</File>
+			<File
+				RelativePath=".\..\src\ottdres.rc">
+			</File>
+			<File
+				RelativePath=".\..\src\pathfind.c">
+			</File>
+			<File
+				RelativePath=".\..\src\players.c">
+			</File>
+			<File
+				RelativePath=".\..\src\queue.c">
+			</File>
+			<File
+				RelativePath=".\..\src\rail.c">
+			</File>
+			<File
+				RelativePath=".\..\src\saveload.c">
+			</File>
+			<File
+				RelativePath=".\..\src\screenshot.c">
+			</File>
+			<File
+				RelativePath=".\..\src\sdl.c">
+			</File>
+			<File
+				RelativePath=".\..\src\settings.c">
+			</File>
+			<File
+				RelativePath=".\..\src\signs.c">
+			</File>
+			<File
+				RelativePath=".\..\src\sound.c">
+			</File>
+			<File
+				RelativePath=".\..\src\spritecache.c">
+			</File>
+			<File
+				RelativePath=".\..\src\string.c">
+			</File>
+			<File
+				RelativePath=".\..\src\strings.c">
+			</File>
+			<File
+				RelativePath=".\..\src\texteff.c">
+			</File>
+			<File
+				RelativePath=".\..\src\tgp.c">
+			</File>
+			<File
+				RelativePath=".\..\src\thread.c">
+			</File>
+			<File
+				RelativePath=".\..\src\tile.c">
+			</File>
+			<File
+				RelativePath=".\..\src\vehicle.c">
+			</File>
+			<File
+				RelativePath=".\..\src\viewport.c">
+			</File>
+			<File
+				RelativePath=".\..\src\waypoint.c">
+			</File>
+			<File
+				RelativePath=".\..\src\widget.c">
+			</File>
+			<File
+				RelativePath=".\..\src\win32.c">
+			</File>
+			<File
+				RelativePath=".\..\src\window.c">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="">
+			<File
+				RelativePath=".\..\src\airport.h">
+			</File>
+			<File
+				RelativePath=".\..\src\airport_movement.h">
+			</File>
+			<File
+				RelativePath=".\..\src\aystar.h">
+			</File>
+			<File
+				RelativePath=".\..\src\bmp.h">
+			</File>
+			<File
+				RelativePath=".\..\src\command.h">
+			</File>
+			<File
+				RelativePath=".\..\src\console.h">
+			</File>
+			<File
+				RelativePath=".\..\src\currency.h">
+			</File>
+			<File
+				RelativePath=".\..\src\date.h">
+			</File>
+			<File
+				RelativePath=".\..\src\debug.h">
+			</File>
+			<File
+				RelativePath=".\..\src\video\dedicated_v.h">
+			</File>
+			<File
+				RelativePath=".\..\src\depot.h">
+			</File>
+			<File
+				RelativePath=".\..\src\music\dmusic.h">
+			</File>
+			<File
+				RelativePath=".\..\src\driver.h">
+			</File>
+			<File
+				RelativePath=".\..\src\economy.h">
+			</File>
+			<File
+				RelativePath=".\..\src\engine.h">
+			</File>
+			<File
+				RelativePath=".\..\src\fontcache.h">
+			</File>
+			<File
+				RelativePath=".\..\src\fileio.h">
+			</File>
+			<File
+				RelativePath=".\..\src\fios.h">
+			</File>
+			<File
+				RelativePath=".\..\src\functions.h">
+			</File>
+			<File
+				RelativePath=".\..\src\genworld.h">
+			</File>
+			<File
+				RelativePath=".\..\src\gfx.h">
+			</File>
+			<File
+				RelativePath=".\..\src\gfxinit.h">
+			</File>
+			<File
+				RelativePath=".\..\src\gui.h">
+			</File>
+			<File
+				RelativePath=".\..\src\hal.h">
+			</File>
+			<File
+				RelativePath=".\..\src\heightmap.h">
+			</File>
+			<File
+				RelativePath=".\..\src\industry.h">
+			</File>
+			<File
+				RelativePath=".\..\src\livery.h">
+			</File>
+			<File
+				RelativePath=".\..\src\macros.h">
+			</File>
+			<File
+				RelativePath=".\..\src\map.h">
+			</File>
+			<File
+				RelativePath=".\..\src\md5.h">
+			</File>
+			<File
+				RelativePath=".\..\src\mixer.h">
+			</File>
+			<File
+				RelativePath=".\..\src\music.h">
+			</File>
+			<File
+				RelativePath=".\..\src\network\core\config.h">
+			</File>
+			<File
+				RelativePath=".\..\src\network\core\game.h">
+			</File>
+			<File
+				RelativePath=".\..\src\network\core\os_abstraction.h">
+			</File>
+			<File
+				RelativePath=".\..\src\network\core\packet.h">
+			</File>
+			<File
+				RelativePath=".\..\src\network\core\tcp.h">
+			</File>
+			<File
+				RelativePath=".\..\src\network\core\udp.h">
+			</File>
+			<File
+				RelativePath=".\..\src\network\network.h">
+			</File>
+			<File
+				RelativePath=".\..\src\network\network_client.h">
+			</File>
+			<File
+				RelativePath=".\..\src\network\network_data.h">
+			</File>
+			<File
+				RelativePath=".\..\src\network\network_gamelist.h">
+			</File>
+			<File
+				RelativePath=".\..\src\network\network_gui.h">
+			</File>
+			<File
+				RelativePath=".\..\src\network\network_server.h">
+			</File>
+			<File
+				RelativePath=".\..\src\network\network_udp.h">
+			</File>
+			<File
+				RelativePath=".\..\src\newgrf.h">
+			</File>
+			<File
+				RelativePath=".\..\src\newgrf_callbacks.h">
+			</File>
+			<File
+				RelativePath=".\..\src\newgrf_cargo.h">
+			</File>
+			<File
+				RelativePath=".\..\src\newgrf_config.h">
+			</File>
+			<File
+				RelativePath=".\..\src\newgrf_engine.h">
+			</File>
+			<File
+				RelativePath=".\..\src\newgrf_sound.h">
+			</File>
+			<File
+				RelativePath=".\..\src\newgrf_spritegroup.h">
+			</File>
+			<File
+				RelativePath=".\..\src\newgrf_station.h">
+			</File>
+			<File
+				RelativePath=".\..\src\newgrf_text.h">
+			</File>
+			<File
+				RelativePath=".\..\src\news.h">
+			</File>
+			<File
+				RelativePath=".\..\src\npf.h">
+			</File>
+			<File
+				RelativePath=".\..\src\music\null_m.h">
+			</File>
+			<File
+				RelativePath=".\..\src\sound\null_s.h">
+			</File>
+			<File
+				RelativePath=".\..\src\video\null_v.h">
+			</File>
+			<File
+				RelativePath=".\..\src\oldpool.h">
+			</File>
+			<File
+				RelativePath=".\..\src\openttd.h">
+			</File>
+			<File
+				RelativePath=".\..\src\pathfind.h">
+			</File>
+			<File
+				RelativePath=".\..\src\player.h">
+			</File>
+			<File
+				RelativePath=".\..\src\queue.h">
+			</File>
+			<File
+				RelativePath=".\..\src\rail.h">
+			</File>
+			<File
+				RelativePath=".\..\src\road_cmd.h">
+			</File>
+			<File
+				RelativePath=".\..\src\saveload.h">
+			</File>
+			<File
+				RelativePath=".\..\src\screenshot.h">
+			</File>
+			<File
+				RelativePath=".\..\src\sound\sdl_s.h">
+			</File>
+			<File
+				RelativePath=".\..\src\video\sdl_v.h">
+			</File>
+			<File
+				RelativePath=".\..\src\settings.h">
+			</File>
+			<File
+				RelativePath=".\..\src\signs.h">
+			</File>
+			<File
+				RelativePath=".\..\src\slope.h">
+			</File>
+			<File
+				RelativePath=".\..\src\sound.h">
+			</File>
+			<File
+				RelativePath=".\..\src\sprite.h">
+			</File>
+			<File
+				RelativePath=".\..\src\station.h">
+			</File>
+			<File
+				RelativePath=".\..\src\stdafx.h">
+			</File>
+			<File
+				RelativePath=".\..\src\string.h">
+			</File>
+			<File
+				RelativePath=".\..\src\tgp.h">
+			</File>
+			<File
+				RelativePath=".\..\src\thread.h">
+			</File>
+			<File
+				RelativePath=".\..\src\tile.h">
+			</File>
+			<File
+				RelativePath=".\..\src\town.h">
+			</File>
+			<File
+				RelativePath=".\..\src\train.h">
+			</File>
+			<File
+				RelativePath=".\..\src\variables.h">
+			</File>
+			<File
+				RelativePath=".\..\src\vehicle.h">
+			</File>
+			<File
+				RelativePath=".\..\src\vehicle_gui.h">
+			</File>
+			<File
+				RelativePath=".\..\src\viewport.h">
+			</File>
+			<File
+				RelativePath=".\..\src\waypoint.h">
+			</File>
+			<File
+				RelativePath=".\..\src\music\win32_m.h">
+			</File>
+			<File
+				RelativePath=".\..\src\sound\win32_s.h">
+			</File>
+			<File
+				RelativePath=".\..\src\video\win32_v.h">
+			</File>
+			<File
+				RelativePath=".\..\src\window.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="GUI Source Code"
+			Filter="">
+			<File
+				RelativePath=".\..\src\aircraft_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\airport_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\bridge_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\build_vehicle_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\depot_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\dock_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\engine_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\genworld_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\graph_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\industry_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\intro_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\main_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\misc_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\music_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\network\network_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\newgrf_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\news_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\order_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\player_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\rail_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\road_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\roadveh_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\settings_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\ship_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\smallmap_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\station_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\subsidy_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\terraform_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\town_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\train_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\vehicle_gui.c">
+			</File>
+		</Filter>
+		<Filter
+			Name="Landscape"
+			Filter="">
+			<File
+				RelativePath=".\..\src\aircraft_cmd.c">
+			</File>
+			<File
+				RelativePath=".\..\src\clear_cmd.c">
+			</File>
+			<File
+				RelativePath=".\..\src\disaster_cmd.c">
+			</File>
+			<File
+				RelativePath=".\..\src\dummy_land.c">
+			</File>
+			<File
+				RelativePath=".\..\src\industry_cmd.c">
+			</File>
+			<File
+				RelativePath=".\..\src\misc_cmd.c">
+			</File>
+			<File
+				RelativePath=".\..\src\order_cmd.c">
+			</File>
+			<File
+				RelativePath=".\..\src\rail_cmd.c">
+			</File>
+			<File
+				RelativePath=".\..\src\road_cmd.c">
+			</File>
+			<File
+				RelativePath=".\..\src\roadveh_cmd.c">
+			</File>
+			<File
+				RelativePath=".\..\src\ship_cmd.c">
+			</File>
+			<File
+				RelativePath=".\..\src\station_cmd.c">
+			</File>
+			<File
+				RelativePath=".\..\src\town_cmd.c">
+			</File>
+			<File
+				RelativePath=".\..\src\train_cmd.c">
+			</File>
+			<File
+				RelativePath=".\..\src\tree_cmd.c">
+			</File>
+			<File
+				RelativePath=".\..\src\tunnelbridge_cmd.c">
+			</File>
+			<File
+				RelativePath=".\..\src\unmovable_cmd.c">
+			</File>
+			<File
+				RelativePath=".\..\src\water_cmd.c">
+			</File>
+		</Filter>
+		<Filter
+			Name="Tables"
+			Filter="">
+			<File
+				RelativePath=".\..\src\table\ai_rail.h">
+			</File>
+			<File
+				RelativePath=".\..\src\table\allstrings.h">
+			</File>
+			<File
+				RelativePath=".\..\src\table\animcursors.h">
+			</File>
+			<File
+				RelativePath=".\..\src\table\autorail.h">
+			</File>
+			<File
+				RelativePath=".\..\src\table\build_industry.h">
+			</File>
+			<File
+				RelativePath=".\..\src\table\clear_land.h">
+			</File>
+			<File
+				RelativePath=".\..\src\table\elrail_data.h">
+			</File>
+			<File
+				RelativePath=".\..\src\table\engines.h">
+			</File>
+			<File
+				RelativePath=".\..\src\table\genland.h">
+			</File>
+			<File
+				RelativePath=".\..\src\table\industry_land.h">
+			</File>
+			<File
+				RelativePath=".\..\src\table\landscape_const.h">
+			</File>
+			<File
+				RelativePath=".\..\src\table\landscape_sprite.h">
+			</File>
+			<File
+				RelativePath=".\..\src\table\namegen.h">
+			</File>
+			<File
+				RelativePath=".\..\src\table\palettes.h">
+			</File>
+			<File
+				RelativePath=".\..\src\table\road_land.h">
+			</File>
+			<File
+				RelativePath=".\..\src\table\roadveh.h">
+			</File>
+			<File
+				RelativePath=".\..\src\table\sprites.h">
+			</File>
+			<File
+				RelativePath=".\..\src\table\station_land.h">
+			</File>
+			<File
+				RelativePath=".\..\src\table\strings.h">
+			</File>
+			<File
+				RelativePath=".\..\src\table\town_land.h">
+			</File>
+			<File
+				RelativePath=".\..\src\table\track_land.h">
+			</File>
+			<File
+				RelativePath=".\..\src\table\train_cmd.h">
+			</File>
+			<File
+				RelativePath=".\..\src\table\tree_land.h">
+			</File>
+			<File
+				RelativePath=".\..\src\table\tunnel_land.h">
+			</File>
+			<File
+				RelativePath=".\..\src\table\unmovable_land.h">
+			</File>
+			<File
+				RelativePath=".\..\src\table\water_land.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="AI Files"
+			Filter="">
+			<File
+				RelativePath=".\..\src\ai\ai.c">
+			</File>
+			<File
+				RelativePath=".\..\src\ai\default\default.c">
+			</File>
+			<File
+				RelativePath=".\..\src\ai\trolly\build.c">
+			</File>
+			<File
+				RelativePath=".\..\src\ai\trolly\pathfinder.c">
+			</File>
+			<File
+				RelativePath=".\..\src\ai\trolly\shared.c">
+			</File>
+			<File
+				RelativePath=".\..\src\ai\trolly\trolly.c">
+			</File>
+		</Filter>
+		<Filter
+			Name="NewGRF"
+			Filter="">
+			<File
+				RelativePath=".\..\src\newgrf.c">
+			</File>
+			<File
+				RelativePath=".\..\src\newgrf_cargo.c">
+			</File>
+			<File
+				RelativePath=".\..\src\newgrf_config.c">
+			</File>
+			<File
+				RelativePath=".\..\src\newgrf_engine.c">
+			</File>
+			<File
+				RelativePath=".\..\src\newgrf_sound.c">
+			</File>
+			<File
+				RelativePath=".\..\src\newgrf_spritegroup.c">
+			</File>
+			<File
+				RelativePath=".\..\src\newgrf_station.c">
+			</File>
+			<File
+				RelativePath=".\..\src\newgrf_text.c">
+			</File>
+		</Filter>
+		<Filter
+			Name="Map Accessors"
+			Filter="">
+			<File
+				RelativePath=".\..\src\bridge_map.c">
+			</File>
+			<File
+				RelativePath=".\..\src\bridge_map.h">
+			</File>
+			<File
+				RelativePath=".\..\src\clear_map.h">
+			</File>
+			<File
+				RelativePath=".\..\src\industry_map.h">
+			</File>
+			<File
+				RelativePath=".\..\src\rail_map.h">
+			</File>
+			<File
+				RelativePath=".\..\src\road_map.c">
+			</File>
+			<File
+				RelativePath=".\..\src\road_map.h">
+			</File>
+			<File
+				RelativePath=".\..\src\station_map.c">
+			</File>
+			<File
+				RelativePath=".\..\src\station_map.h">
+			</File>
+			<File
+				RelativePath=".\..\src\town_map.h">
+			</File>
+			<File
+				RelativePath=".\..\src\tree_map.h">
+			</File>
+			<File
+				RelativePath=".\..\src\tunnel_map.c">
+			</File>
+			<File
+				RelativePath=".\..\src\tunnel_map.h">
+			</File>
+			<File
+				RelativePath=".\..\src\unmovable_map.h">
+			</File>
+			<File
+				RelativePath=".\..\src\void_map.h">
+			</File>
+			<File
+				RelativePath=".\..\src\water_map.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="YAPF"
+			Filter="">
+			<File
+				RelativePath=".\..\src\yapf\array.hpp">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\autocopyptr.hpp">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\binaryheap.hpp">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\blob.hpp">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\countedptr.hpp">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\crc32.hpp">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\fixedsizearray.hpp">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\follow_track.cpp">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\follow_track.hpp">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\hashtable.hpp">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\nodelist.hpp">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\track_dir.hpp">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\yapf.h">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\yapf.hpp">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\yapf_base.hpp">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\yapf_common.cpp">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\yapf_common.hpp">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\yapf_costbase.hpp">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\yapf_costcache.hpp">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\yapf_costrail.hpp">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\yapf_destrail.hpp">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\yapf_node.hpp">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\yapf_node_rail.hpp">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\yapf_node_road.hpp">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\yapf_rail.cpp">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\yapf_road.cpp">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\yapf_settings.h">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\yapf_ship.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="Video"
+			Filter="">
+			<File
+				RelativePath=".\..\src\video\dedicated_v.c">
+			</File>
+			<File
+				RelativePath=".\..\src\video\null_v.c">
+			</File>
+			<File
+				RelativePath=".\..\src\video\sdl_v.c">
+			</File>
+			<File
+				RelativePath=".\..\src\video\win32_v.c">
+			</File>
+		</Filter>
+		<Filter
+			Name="Music"
+			Filter="">
+			<File
+				RelativePath=".\..\src\music\dmusic.cpp">
+			</File>
+			<File
+				RelativePath=".\..\src\music\null_m.c">
+			</File>
+			<File
+				RelativePath=".\..\src\music\win32_m.c">
+			</File>
+		</Filter>
+		<Filter
+			Name="Sound"
+			Filter="">
+			<File
+				RelativePath=".\..\src\sound\null_s.c">
+			</File>
+			<File
+				RelativePath=".\..\src\sound\sdl_s.c">
+			</File>
+			<File
+				RelativePath=".\..\src\sound\win32_s.c">
+			</File>
+		</Filter>
+		<File
+			RelativePath=".\..\media\mainicon.ico">
+		</File>
+		<File
+			RelativePath=".\..\media\openttd.ico">
+		</File>
+		<File
+			RelativePath=".\..\readme.txt">
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/projects/openttd.vcproj.in b/projects/openttd.vcproj.in
new file mode 100644
index 000000000..6a38fdeb4
--- /dev/null
+++ b/projects/openttd.vcproj.in
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="openttd"
+	RootNameSpace="openttd"
+	SccProjectName=""
+	SccLocalPath="">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\objs\$(ConfigurationName)"
+			IntermediateDirectory="..\objs\$(ConfigurationName)"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2"
+			WholeProgramOptimization="TRUE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				GlobalOptimizations="TRUE"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="TRUE"
+				FavorSizeOrSpeed="2"
+				OmitFramePointers="TRUE"
+				OptimizeForProcessor="1"
+				AdditionalIncludeDirectories="..\objs\langs"
+				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="$(IntDir)/"
+				ObjectFile="$(IntDir)/"
+				ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"
+				BrowseInformation="1"
+				BrowseInformationFile="$(IntDir)/"
+				WarningLevel="3"
+				WarnAsError="TRUE"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="3"
+				CallingConvention="1"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="unicows.lib winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				IgnoreDefaultLibraryNames=""
+				GenerateDebugInformation="TRUE"
+				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="..\objs\$(ConfigurationName)\"
+			IntermediateDirectory="..\objs\$(ConfigurationName)\"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="1">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\objs\langs"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				AssemblerListingLocation="$(IntDir)/"
+				ObjectFile="$(IntDir)/"
+				ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"
+				WarningLevel="3"
+				WarnAsError="TRUE"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="4"
+				CallingConvention="1"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="unicows.lib winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib"
+				LinkIncremental="0"
+				SuppressStartupBanner="TRUE"
+				IgnoreDefaultLibraryNames="LIBCMT.lib"
+				GenerateDebugInformation="TRUE"
+				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>
+!!FILES!!
+		<File
+			RelativePath=".\..\media\mainicon.ico">
+		</File>
+		<File
+			RelativePath=".\..\media\openttd.ico">
+		</File>
+		<File
+			RelativePath=".\..\readme.txt">
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/openttd.xcode/default.pbxuser b/projects/openttd.xcode/default.pbxuser
index 7f985e081..7f985e081 100644
--- a/openttd.xcode/default.pbxuser
+++ b/projects/openttd.xcode/default.pbxuser
diff --git a/openttd.xcode/project.pbxproj b/projects/openttd.xcode/project.pbxproj
index 82f48279c..82f48279c 100644
--- a/openttd.xcode/project.pbxproj
+++ b/projects/openttd.xcode/project.pbxproj
diff --git a/openttd_vs80.sln b/projects/openttd_vs80.sln
index f6434f8a4..7401d3824 100644
--- a/openttd_vs80.sln
+++ b/projects/openttd_vs80.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "strgen", "strgen\strgen_vs80.vcproj", "{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "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
diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj
new file mode 100644
index 000000000..c4e9d03d1
--- /dev/null
+++ b/projects/openttd_vs80.vcproj
@@ -0,0 +1,1464 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="openttd"
+	ProjectGUID="{668328A0-B40E-4CDB-BD72-D0064424414A}"
+	RootNamespace="openttd"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+		<ToolFile
+			RelativePath="..\src\masm64.rules"
+		/>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\"
+			IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="MASM AMD64"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Release/openttd.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="2"
+				OmitFramePointers="true"
+				AdditionalIncludeDirectories="..\objs\langs"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK"
+				StringPooling="true"
+				ExceptionHandling="1"
+				RuntimeLibrary="0"
+				StructMemberAlignment="3"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="true"
+				DefaultCharIsUnsigned="true"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderThrough=""
+				PrecompiledHeaderFile=""
+				AssemblerOutput="2"
+				AssemblerListingLocation="$(IntDir)/"
+				ObjectFile="$(IntDir)/"
+				ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"
+				BrowseInformation="1"
+				BrowseInformationFile="$(IntDir)/"
+				WarningLevel="3"
+				WarnAsError="true"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+				CallingConvention="1"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1053"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				IgnoreDefaultLibraryNames=""
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				OptimizeForWindows98="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="MASM AMD64"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+				TypeLibraryName=".\Release/openttd.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="2"
+				OmitFramePointers="true"
+				AdditionalIncludeDirectories="..\objs\langs"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK"
+				StringPooling="true"
+				ExceptionHandling="1"
+				RuntimeLibrary="0"
+				StructMemberAlignment="0"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="true"
+				DefaultCharIsUnsigned="true"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderThrough=""
+				PrecompiledHeaderFile=""
+				AssemblerOutput="2"
+				AssemblerListingLocation="$(IntDir)/"
+				ObjectFile="$(IntDir)/"
+				ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"
+				BrowseInformation="1"
+				BrowseInformationFile="$(IntDir)/"
+				WarningLevel="3"
+				WarnAsError="false"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+				CallingConvention="1"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1053"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				IgnoreDefaultLibraryNames=""
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				OptimizeForWindows98="1"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\"
+			IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="MASM AMD64"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Debug/openttd.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\objs\langs"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				AssemblerListingLocation="$(IntDir)/"
+				ObjectFile="$(IntDir)/"
+				ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"
+				WarningLevel="3"
+				WarnAsError="true"
+				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="4"
+				CallingConvention="1"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1053"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib"
+				LinkIncremental="0"
+				SuppressStartupBanner="true"
+				IgnoreDefaultLibraryNames="LIBCMT.lib"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="MASM AMD64"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+				TypeLibraryName=".\Debug/openttd.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\objs\langs"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderThrough=""
+				PrecompiledHeaderFile=""
+				AssemblerListingLocation="$(IntDir)/"
+				ObjectFile="$(IntDir)/"
+				ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"
+				WarningLevel="3"
+				WarnAsError="false"
+				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+				CallingConvention="0"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1053"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib"
+				LinkIncremental="0"
+				SuppressStartupBanner="true"
+				IgnoreDefaultLibraryNames="LIBCMT.lib"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="">
+			<File
+				RelativePath=".\..\src\airport.c">
+			</File>
+			<File
+				RelativePath=".\..\src\aystar.c">
+			</File>
+			<File
+				RelativePath=".\..\src\bmp.c">
+			</File>
+			<File
+				RelativePath=".\..\src\callback_table.c">
+			</File>
+			<File
+				RelativePath=".\..\src\command.c">
+			</File>
+			<File
+				RelativePath=".\..\src\console.c">
+			</File>
+			<File
+				RelativePath=".\..\src\console_cmds.c">
+			</File>
+			<File
+				RelativePath=".\..\src\currency.c">
+			</File>
+			<File
+				RelativePath=".\..\src\date.c">
+			</File>
+			<File
+				RelativePath=".\..\src\debug.c">
+			</File>
+			<File
+				RelativePath=".\..\src\dedicated.c">
+			</File>
+			<File
+				RelativePath=".\..\src\depot.c">
+			</File>
+			<File
+				RelativePath=".\..\src\driver.c">
+			</File>
+			<File
+				RelativePath=".\..\src\economy.c">
+			</File>
+			<File
+				RelativePath=".\..\src\elrail.c">
+			</File>
+			<File
+				RelativePath=".\..\src\engine.c">
+			</File>
+			<File
+				RelativePath=".\..\src\fileio.c">
+			</File>
+			<File
+				RelativePath=".\..\src\fios.c">
+			</File>
+			<File
+				RelativePath=".\..\src\fontcache.c">
+			</File>
+			<File
+				RelativePath=".\..\src\genworld.c">
+			</File>
+			<File
+				RelativePath=".\..\src\gfx.c">
+			</File>
+			<File
+				RelativePath=".\..\src\gfxinit.c">
+			</File>
+			<File
+				RelativePath=".\..\src\heightmap.c">
+			</File>
+			<File
+				RelativePath=".\..\src\helpers.cpp">
+			</File>
+			<File
+				RelativePath=".\..\src\landscape.c">
+			</File>
+			<File
+				RelativePath=".\..\src\map.c">
+			</File>
+			<File
+				RelativePath=".\..\src\md5.c">
+			</File>
+			<File
+				RelativePath=".\..\src\mersenne.c">
+			</File>
+			<File
+				RelativePath=".\..\src\minilzo.c">
+			</File>
+			<File
+				RelativePath=".\..\src\misc.c">
+			</File>
+			<File
+				RelativePath=".\..\src\mixer.c">
+			</File>
+			<File
+				RelativePath=".\..\src\music.c">
+			</File>
+			<File
+				RelativePath=".\..\src\namegen.c">
+			</File>
+			<File
+				RelativePath=".\..\src\network\core\packet.c">
+			</File>
+			<File
+				RelativePath=".\..\src\network\core\tcp.c">
+			</File>
+			<File
+				RelativePath=".\..\src\network\core\udp.c">
+			</File>
+			<File
+				RelativePath=".\..\src\network\network.c">
+			</File>
+			<File
+				RelativePath=".\..\src\network\network_client.c">
+			</File>
+			<File
+				RelativePath=".\..\src\network\network_data.c">
+			</File>
+			<File
+				RelativePath=".\..\src\network\network_gamelist.c">
+			</File>
+			<File
+				RelativePath=".\..\src\network\network_server.c">
+			</File>
+			<File
+				RelativePath=".\..\src\network\network_udp.c">
+			</File>
+			<File
+				RelativePath=".\..\src\npf.c">
+			</File>
+			<File
+				RelativePath=".\..\src\oldloader.c">
+			</File>
+			<File
+				RelativePath=".\..\src\oldpool.c">
+			</File>
+			<File
+				RelativePath=".\..\src\openttd.c">
+			</File>
+			<File
+				RelativePath=".\..\src\os_timer.c">
+			</File>
+			<File
+				RelativePath=".\..\src\ottdres.rc">
+			</File>
+			<File
+				RelativePath=".\..\src\pathfind.c">
+			</File>
+			<File
+				RelativePath=".\..\src\players.c">
+			</File>
+			<File
+				RelativePath=".\..\src\queue.c">
+			</File>
+			<File
+				RelativePath=".\..\src\rail.c">
+			</File>
+			<File
+				RelativePath=".\..\src\saveload.c">
+			</File>
+			<File
+				RelativePath=".\..\src\screenshot.c">
+			</File>
+			<File
+				RelativePath=".\..\src\sdl.c">
+			</File>
+			<File
+				RelativePath=".\..\src\settings.c">
+			</File>
+			<File
+				RelativePath=".\..\src\signs.c">
+			</File>
+			<File
+				RelativePath=".\..\src\sound.c">
+			</File>
+			<File
+				RelativePath=".\..\src\spritecache.c">
+			</File>
+			<File
+				RelativePath=".\..\src\string.c">
+			</File>
+			<File
+				RelativePath=".\..\src\strings.c">
+			</File>
+			<File
+				RelativePath=".\..\src\texteff.c">
+			</File>
+			<File
+				RelativePath=".\..\src\tgp.c">
+			</File>
+			<File
+				RelativePath=".\..\src\thread.c">
+			</File>
+			<File
+				RelativePath=".\..\src\tile.c">
+			</File>
+			<File
+				RelativePath=".\..\src\vehicle.c">
+			</File>
+			<File
+				RelativePath=".\..\src\viewport.c">
+			</File>
+			<File
+				RelativePath=".\..\src\waypoint.c">
+			</File>
+			<File
+				RelativePath=".\..\src\widget.c">
+			</File>
+			<File
+				RelativePath=".\..\src\win32.c">
+			</File>
+			<File
+				RelativePath=".\..\src\window.c">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="">
+			<File
+				RelativePath=".\..\src\airport.h">
+			</File>
+			<File
+				RelativePath=".\..\src\airport_movement.h">
+			</File>
+			<File
+				RelativePath=".\..\src\aystar.h">
+			</File>
+			<File
+				RelativePath=".\..\src\bmp.h">
+			</File>
+			<File
+				RelativePath=".\..\src\command.h">
+			</File>
+			<File
+				RelativePath=".\..\src\console.h">
+			</File>
+			<File
+				RelativePath=".\..\src\currency.h">
+			</File>
+			<File
+				RelativePath=".\..\src\date.h">
+			</File>
+			<File
+				RelativePath=".\..\src\debug.h">
+			</File>
+			<File
+				RelativePath=".\..\src\video\dedicated_v.h">
+			</File>
+			<File
+				RelativePath=".\..\src\depot.h">
+			</File>
+			<File
+				RelativePath=".\..\src\music\dmusic.h">
+			</File>
+			<File
+				RelativePath=".\..\src\driver.h">
+			</File>
+			<File
+				RelativePath=".\..\src\economy.h">
+			</File>
+			<File
+				RelativePath=".\..\src\engine.h">
+			</File>
+			<File
+				RelativePath=".\..\src\fontcache.h">
+			</File>
+			<File
+				RelativePath=".\..\src\fileio.h">
+			</File>
+			<File
+				RelativePath=".\..\src\fios.h">
+			</File>
+			<File
+				RelativePath=".\..\src\functions.h">
+			</File>
+			<File
+				RelativePath=".\..\src\genworld.h">
+			</File>
+			<File
+				RelativePath=".\..\src\gfx.h">
+			</File>
+			<File
+				RelativePath=".\..\src\gfxinit.h">
+			</File>
+			<File
+				RelativePath=".\..\src\gui.h">
+			</File>
+			<File
+				RelativePath=".\..\src\hal.h">
+			</File>
+			<File
+				RelativePath=".\..\src\heightmap.h">
+			</File>
+			<File
+				RelativePath=".\..\src\industry.h">
+			</File>
+			<File
+				RelativePath=".\..\src\livery.h">
+			</File>
+			<File
+				RelativePath=".\..\src\macros.h">
+			</File>
+			<File
+				RelativePath=".\..\src\map.h">
+			</File>
+			<File
+				RelativePath=".\..\src\md5.h">
+			</File>
+			<File
+				RelativePath=".\..\src\mixer.h">
+			</File>
+			<File
+				RelativePath=".\..\src\music.h">
+			</File>
+			<File
+				RelativePath=".\..\src\network\core\config.h">
+			</File>
+			<File
+				RelativePath=".\..\src\network\core\game.h">
+			</File>
+			<File
+				RelativePath=".\..\src\network\core\os_abstraction.h">
+			</File>
+			<File
+				RelativePath=".\..\src\network\core\packet.h">
+			</File>
+			<File
+				RelativePath=".\..\src\network\core\tcp.h">
+			</File>
+			<File
+				RelativePath=".\..\src\network\core\udp.h">
+			</File>
+			<File
+				RelativePath=".\..\src\network\network.h">
+			</File>
+			<File
+				RelativePath=".\..\src\network\network_client.h">
+			</File>
+			<File
+				RelativePath=".\..\src\network\network_data.h">
+			</File>
+			<File
+				RelativePath=".\..\src\network\network_gamelist.h">
+			</File>
+			<File
+				RelativePath=".\..\src\network\network_gui.h">
+			</File>
+			<File
+				RelativePath=".\..\src\network\network_server.h">
+			</File>
+			<File
+				RelativePath=".\..\src\network\network_udp.h">
+			</File>
+			<File
+				RelativePath=".\..\src\newgrf.h">
+			</File>
+			<File
+				RelativePath=".\..\src\newgrf_callbacks.h">
+			</File>
+			<File
+				RelativePath=".\..\src\newgrf_cargo.h">
+			</File>
+			<File
+				RelativePath=".\..\src\newgrf_config.h">
+			</File>
+			<File
+				RelativePath=".\..\src\newgrf_engine.h">
+			</File>
+			<File
+				RelativePath=".\..\src\newgrf_sound.h">
+			</File>
+			<File
+				RelativePath=".\..\src\newgrf_spritegroup.h">
+			</File>
+			<File
+				RelativePath=".\..\src\newgrf_station.h">
+			</File>
+			<File
+				RelativePath=".\..\src\newgrf_text.h">
+			</File>
+			<File
+				RelativePath=".\..\src\news.h">
+			</File>
+			<File
+				RelativePath=".\..\src\npf.h">
+			</File>
+			<File
+				RelativePath=".\..\src\music\null_m.h">
+			</File>
+			<File
+				RelativePath=".\..\src\sound\null_s.h">
+			</File>
+			<File
+				RelativePath=".\..\src\video\null_v.h">
+			</File>
+			<File
+				RelativePath=".\..\src\oldpool.h">
+			</File>
+			<File
+				RelativePath=".\..\src\openttd.h">
+			</File>
+			<File
+				RelativePath=".\..\src\pathfind.h">
+			</File>
+			<File
+				RelativePath=".\..\src\player.h">
+			</File>
+			<File
+				RelativePath=".\..\src\queue.h">
+			</File>
+			<File
+				RelativePath=".\..\src\rail.h">
+			</File>
+			<File
+				RelativePath=".\..\src\road_cmd.h">
+			</File>
+			<File
+				RelativePath=".\..\src\saveload.h">
+			</File>
+			<File
+				RelativePath=".\..\src\screenshot.h">
+			</File>
+			<File
+				RelativePath=".\..\src\sound\sdl_s.h">
+			</File>
+			<File
+				RelativePath=".\..\src\video\sdl_v.h">
+			</File>
+			<File
+				RelativePath=".\..\src\settings.h">
+			</File>
+			<File
+				RelativePath=".\..\src\signs.h">
+			</File>
+			<File
+				RelativePath=".\..\src\slope.h">
+			</File>
+			<File
+				RelativePath=".\..\src\sound.h">
+			</File>
+			<File
+				RelativePath=".\..\src\sprite.h">
+			</File>
+			<File
+				RelativePath=".\..\src\station.h">
+			</File>
+			<File
+				RelativePath=".\..\src\stdafx.h">
+			</File>
+			<File
+				RelativePath=".\..\src\string.h">
+			</File>
+			<File
+				RelativePath=".\..\src\tgp.h">
+			</File>
+			<File
+				RelativePath=".\..\src\thread.h">
+			</File>
+			<File
+				RelativePath=".\..\src\tile.h">
+			</File>
+			<File
+				RelativePath=".\..\src\town.h">
+			</File>
+			<File
+				RelativePath=".\..\src\train.h">
+			</File>
+			<File
+				RelativePath=".\..\src\variables.h">
+			</File>
+			<File
+				RelativePath=".\..\src\vehicle.h">
+			</File>
+			<File
+				RelativePath=".\..\src\vehicle_gui.h">
+			</File>
+			<File
+				RelativePath=".\..\src\viewport.h">
+			</File>
+			<File
+				RelativePath=".\..\src\waypoint.h">
+			</File>
+			<File
+				RelativePath=".\..\src\music\win32_m.h">
+			</File>
+			<File
+				RelativePath=".\..\src\sound\win32_s.h">
+			</File>
+			<File
+				RelativePath=".\..\src\video\win32_v.h">
+			</File>
+			<File
+				RelativePath=".\..\src\window.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="GUI Source Code"
+			Filter="">
+			<File
+				RelativePath=".\..\src\aircraft_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\airport_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\bridge_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\build_vehicle_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\depot_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\dock_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\engine_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\genworld_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\graph_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\industry_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\intro_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\main_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\misc_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\music_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\network\network_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\newgrf_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\news_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\order_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\player_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\rail_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\road_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\roadveh_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\settings_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\ship_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\smallmap_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\station_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\subsidy_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\terraform_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\town_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\train_gui.c">
+			</File>
+			<File
+				RelativePath=".\..\src\vehicle_gui.c">
+			</File>
+		</Filter>
+		<Filter
+			Name="Landscape"
+			Filter="">
+			<File
+				RelativePath=".\..\src\aircraft_cmd.c">
+			</File>
+			<File
+				RelativePath=".\..\src\clear_cmd.c">
+			</File>
+			<File
+				RelativePath=".\..\src\disaster_cmd.c">
+			</File>
+			<File
+				RelativePath=".\..\src\dummy_land.c">
+			</File>
+			<File
+				RelativePath=".\..\src\industry_cmd.c">
+			</File>
+			<File
+				RelativePath=".\..\src\misc_cmd.c">
+			</File>
+			<File
+				RelativePath=".\..\src\order_cmd.c">
+			</File>
+			<File
+				RelativePath=".\..\src\rail_cmd.c">
+			</File>
+			<File
+				RelativePath=".\..\src\road_cmd.c">
+			</File>
+			<File
+				RelativePath=".\..\src\roadveh_cmd.c">
+			</File>
+			<File
+				RelativePath=".\..\src\ship_cmd.c">
+			</File>
+			<File
+				RelativePath=".\..\src\station_cmd.c">
+			</File>
+			<File
+				RelativePath=".\..\src\town_cmd.c">
+			</File>
+			<File
+				RelativePath=".\..\src\train_cmd.c">
+			</File>
+			<File
+				RelativePath=".\..\src\tree_cmd.c">
+			</File>
+			<File
+				RelativePath=".\..\src\tunnelbridge_cmd.c">
+			</File>
+			<File
+				RelativePath=".\..\src\unmovable_cmd.c">
+			</File>
+			<File
+				RelativePath=".\..\src\water_cmd.c">
+			</File>
+		</Filter>
+		<Filter
+			Name="Tables"
+			Filter="">
+			<File
+				RelativePath=".\..\src\table\ai_rail.h">
+			</File>
+			<File
+				RelativePath=".\..\src\table\allstrings.h">
+			</File>
+			<File
+				RelativePath=".\..\src\table\animcursors.h">
+			</File>
+			<File
+				RelativePath=".\..\src\table\autorail.h">
+			</File>
+			<File
+				RelativePath=".\..\src\table\build_industry.h">
+			</File>
+			<File
+				RelativePath=".\..\src\table\clear_land.h">
+			</File>
+			<File
+				RelativePath=".\..\src\table\elrail_data.h">
+			</File>
+			<File
+				RelativePath=".\..\src\table\engines.h">
+			</File>
+			<File
+				RelativePath=".\..\src\table\genland.h">
+			</File>
+			<File
+				RelativePath=".\..\src\table\industry_land.h">
+			</File>
+			<File
+				RelativePath=".\..\src\table\landscape_const.h">
+			</File>
+			<File
+				RelativePath=".\..\src\table\landscape_sprite.h">
+			</File>
+			<File
+				RelativePath=".\..\src\table\namegen.h">
+			</File>
+			<File
+				RelativePath=".\..\src\table\palettes.h">
+			</File>
+			<File
+				RelativePath=".\..\src\table\road_land.h">
+			</File>
+			<File
+				RelativePath=".\..\src\table\roadveh.h">
+			</File>
+			<File
+				RelativePath=".\..\src\table\sprites.h">
+			</File>
+			<File
+				RelativePath=".\..\src\table\station_land.h">
+			</File>
+			<File
+				RelativePath=".\..\src\table\strings.h">
+			</File>
+			<File
+				RelativePath=".\..\src\table\town_land.h">
+			</File>
+			<File
+				RelativePath=".\..\src\table\track_land.h">
+			</File>
+			<File
+				RelativePath=".\..\src\table\train_cmd.h">
+			</File>
+			<File
+				RelativePath=".\..\src\table\tree_land.h">
+			</File>
+			<File
+				RelativePath=".\..\src\table\tunnel_land.h">
+			</File>
+			<File
+				RelativePath=".\..\src\table\unmovable_land.h">
+			</File>
+			<File
+				RelativePath=".\..\src\table\water_land.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="AI Files"
+			Filter="">
+			<File
+				RelativePath=".\..\src\ai\ai.c">
+			</File>
+			<File
+				RelativePath=".\..\src\ai\default\default.c">
+			</File>
+			<File
+				RelativePath=".\..\src\ai\trolly\build.c">
+			</File>
+			<File
+				RelativePath=".\..\src\ai\trolly\pathfinder.c">
+			</File>
+			<File
+				RelativePath=".\..\src\ai\trolly\shared.c">
+			</File>
+			<File
+				RelativePath=".\..\src\ai\trolly\trolly.c">
+			</File>
+		</Filter>
+		<Filter
+			Name="NewGRF"
+			Filter="">
+			<File
+				RelativePath=".\..\src\newgrf.c">
+			</File>
+			<File
+				RelativePath=".\..\src\newgrf_cargo.c">
+			</File>
+			<File
+				RelativePath=".\..\src\newgrf_config.c">
+			</File>
+			<File
+				RelativePath=".\..\src\newgrf_engine.c">
+			</File>
+			<File
+				RelativePath=".\..\src\newgrf_sound.c">
+			</File>
+			<File
+				RelativePath=".\..\src\newgrf_spritegroup.c">
+			</File>
+			<File
+				RelativePath=".\..\src\newgrf_station.c">
+			</File>
+			<File
+				RelativePath=".\..\src\newgrf_text.c">
+			</File>
+		</Filter>
+		<Filter
+			Name="Map Accessors"
+			Filter="">
+			<File
+				RelativePath=".\..\src\bridge_map.c">
+			</File>
+			<File
+				RelativePath=".\..\src\bridge_map.h">
+			</File>
+			<File
+				RelativePath=".\..\src\clear_map.h">
+			</File>
+			<File
+				RelativePath=".\..\src\industry_map.h">
+			</File>
+			<File
+				RelativePath=".\..\src\rail_map.h">
+			</File>
+			<File
+				RelativePath=".\..\src\road_map.c">
+			</File>
+			<File
+				RelativePath=".\..\src\road_map.h">
+			</File>
+			<File
+				RelativePath=".\..\src\station_map.c">
+			</File>
+			<File
+				RelativePath=".\..\src\station_map.h">
+			</File>
+			<File
+				RelativePath=".\..\src\town_map.h">
+			</File>
+			<File
+				RelativePath=".\..\src\tree_map.h">
+			</File>
+			<File
+				RelativePath=".\..\src\tunnel_map.c">
+			</File>
+			<File
+				RelativePath=".\..\src\tunnel_map.h">
+			</File>
+			<File
+				RelativePath=".\..\src\unmovable_map.h">
+			</File>
+			<File
+				RelativePath=".\..\src\void_map.h">
+			</File>
+			<File
+				RelativePath=".\..\src\water_map.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="YAPF"
+			Filter="">
+			<File
+				RelativePath=".\..\src\yapf\array.hpp">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\autocopyptr.hpp">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\binaryheap.hpp">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\blob.hpp">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\countedptr.hpp">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\crc32.hpp">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\fixedsizearray.hpp">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\follow_track.cpp">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\follow_track.hpp">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\hashtable.hpp">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\nodelist.hpp">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\track_dir.hpp">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\yapf.h">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\yapf.hpp">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\yapf_base.hpp">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\yapf_common.cpp">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\yapf_common.hpp">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\yapf_costbase.hpp">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\yapf_costcache.hpp">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\yapf_costrail.hpp">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\yapf_destrail.hpp">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\yapf_node.hpp">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\yapf_node_rail.hpp">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\yapf_node_road.hpp">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\yapf_rail.cpp">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\yapf_road.cpp">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\yapf_settings.h">
+			</File>
+			<File
+				RelativePath=".\..\src\yapf\yapf_ship.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="Video"
+			Filter="">
+			<File
+				RelativePath=".\..\src\video\dedicated_v.c">
+			</File>
+			<File
+				RelativePath=".\..\src\video\null_v.c">
+			</File>
+			<File
+				RelativePath=".\..\src\video\sdl_v.c">
+			</File>
+			<File
+				RelativePath=".\..\src\video\win32_v.c">
+			</File>
+		</Filter>
+		<Filter
+			Name="Music"
+			Filter="">
+			<File
+				RelativePath=".\..\src\music\dmusic.cpp">
+			</File>
+			<File
+				RelativePath=".\..\src\music\null_m.c">
+			</File>
+			<File
+				RelativePath=".\..\src\music\win32_m.c">
+			</File>
+		</Filter>
+		<Filter
+			Name="Sound"
+			Filter="">
+			<File
+				RelativePath=".\..\src\sound\null_s.c">
+			</File>
+			<File
+				RelativePath=".\..\src\sound\sdl_s.c">
+			</File>
+			<File
+				RelativePath=".\..\src\sound\win32_s.c">
+			</File>
+		</Filter>
+		<Filter
+			Name="64-bit Specific Files"
+			Filter="asm"
+			>
+			<File
+				RelativePath=".\..\src\win64.asm"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="MASM AMD64"
+						PreserveIdentifierCase="true"
+						PreservePublicAndExternSymbolCase="true"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="MASM AMD64"
+						PreserveIdentifierCase="true"
+						PreservePublicAndExternSymbolCase="true"
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<File
+			RelativePath=".\..\media\mainicon.ico">
+		</File>
+		<File
+			RelativePath=".\..\media\openttd.ico">
+		</File>
+		<File
+			RelativePath=".\..\readme.txt">
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/projects/openttd_vs80.vcproj.in b/projects/openttd_vs80.vcproj.in
new file mode 100644
index 000000000..7ec0f03b9
--- /dev/null
+++ b/projects/openttd_vs80.vcproj.in
@@ -0,0 +1,499 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="openttd"
+	ProjectGUID="{668328A0-B40E-4CDB-BD72-D0064424414A}"
+	RootNamespace="openttd"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+		<ToolFile
+			RelativePath="..\src\masm64.rules"
+		/>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\"
+			IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="MASM AMD64"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Release/openttd.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="2"
+				OmitFramePointers="true"
+				AdditionalIncludeDirectories="..\objs\langs"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK"
+				StringPooling="true"
+				ExceptionHandling="1"
+				RuntimeLibrary="0"
+				StructMemberAlignment="3"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="true"
+				DefaultCharIsUnsigned="true"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderThrough=""
+				PrecompiledHeaderFile=""
+				AssemblerOutput="2"
+				AssemblerListingLocation="$(IntDir)/"
+				ObjectFile="$(IntDir)/"
+				ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"
+				BrowseInformation="1"
+				BrowseInformationFile="$(IntDir)/"
+				WarningLevel="3"
+				WarnAsError="true"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+				CallingConvention="1"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1053"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				IgnoreDefaultLibraryNames=""
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				OptimizeForWindows98="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="MASM AMD64"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+				TypeLibraryName=".\Release/openttd.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="2"
+				OmitFramePointers="true"
+				AdditionalIncludeDirectories="..\objs\langs"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK"
+				StringPooling="true"
+				ExceptionHandling="1"
+				RuntimeLibrary="0"
+				StructMemberAlignment="0"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="true"
+				DefaultCharIsUnsigned="true"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderThrough=""
+				PrecompiledHeaderFile=""
+				AssemblerOutput="2"
+				AssemblerListingLocation="$(IntDir)/"
+				ObjectFile="$(IntDir)/"
+				ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"
+				BrowseInformation="1"
+				BrowseInformationFile="$(IntDir)/"
+				WarningLevel="3"
+				WarnAsError="false"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+				CallingConvention="1"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1053"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				IgnoreDefaultLibraryNames=""
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				OptimizeForWindows98="1"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\"
+			IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="MASM AMD64"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Debug/openttd.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\objs\langs"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				AssemblerListingLocation="$(IntDir)/"
+				ObjectFile="$(IntDir)/"
+				ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"
+				WarningLevel="3"
+				WarnAsError="true"
+				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="4"
+				CallingConvention="1"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1053"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib"
+				LinkIncremental="0"
+				SuppressStartupBanner="true"
+				IgnoreDefaultLibraryNames="LIBCMT.lib"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="MASM AMD64"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+				TypeLibraryName=".\Debug/openttd.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\objs\langs"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderThrough=""
+				PrecompiledHeaderFile=""
+				AssemblerListingLocation="$(IntDir)/"
+				ObjectFile="$(IntDir)/"
+				ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"
+				WarningLevel="3"
+				WarnAsError="false"
+				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+				CallingConvention="0"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1053"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib"
+				LinkIncremental="0"
+				SuppressStartupBanner="true"
+				IgnoreDefaultLibraryNames="LIBCMT.lib"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+!!FILES!!
+		<Filter
+			Name="64-bit Specific Files"
+			Filter="asm"
+			>
+			<File
+				RelativePath=".\..\src\win64.asm"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="MASM AMD64"
+						PreserveIdentifierCase="true"
+						PreservePublicAndExternSymbolCase="true"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="MASM AMD64"
+						PreserveIdentifierCase="true"
+						PreservePublicAndExternSymbolCase="true"
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<File
+			RelativePath=".\..\media\mainicon.ico">
+		</File>
+		<File
+			RelativePath=".\..\media\openttd.ico">
+		</File>
+		<File
+			RelativePath=".\..\readme.txt">
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/projects/openttd_vs80.vcproj.user b/projects/openttd_vs80.vcproj.user
new file mode 100644
index 000000000..2d523a7ce
--- /dev/null
+++ b/projects/openttd_vs80.vcproj.user
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioUserFile
+	ProjectType="Visual C++"
+	Version="8.00"
+	ShowAllFiles="false"
+	>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			>
+			<DebugSettings
+				WorkingDirectory="..\bin"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			>
+			<DebugSettings
+				WorkingDirectory="..\bin"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			>
+			<DebugSettings
+				WorkingDirectory="..\bin"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			>
+			<DebugSettings
+				WorkingDirectory="..\bin"
+			/>
+		</Configuration>
+	</Configurations>
+</VisualStudioUserFile>
diff --git a/strgen/strgen.tgt b/projects/strgen.tgt
index a328100b6..a328100b6 100644
--- a/strgen/strgen.tgt
+++ b/projects/strgen.tgt
diff --git a/strgen/strgen.vcproj b/projects/strgen.vcproj
index 9ca995297..cb53240c7 100644
--- a/strgen/strgen.vcproj
+++ b/projects/strgen.vcproj
@@ -3,6 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.10"
 	Name="strgen"
+	RootNamespace="strgen"
 	SccProjectName=""
 	SccLocalPath="">
 	<Platforms>
@@ -11,23 +12,26 @@
 	</Platforms>
 	<Configurations>
 		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
+			Name="Release|Win32"
+			OutputDirectory="..\objs\strgen\"
+			IntermediateDirectory="..\objs\strgen\"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;STRGEN"
-				BasicRuntimeChecks="3"
+				Optimization="1"
+				GlobalOptimizations="TRUE"
+				FavorSizeOrSpeed="2"
+				PreprocessorDefinitions="STRGEN;WIN32;NDEBUG;_CONSOLE"
+				BasicRuntimeChecks="0"
 				RuntimeLibrary="5"
-				PrecompiledHeaderFile=".\Debug/strgen.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
+				PrecompiledHeaderFile=""
+				AssemblerOutput="2"
+				AssemblerListingLocation="$(IntDir)"
+				ObjectFile="$(IntDir)"
+				ProgramDataBaseFileName="$(IntDir)"
 				WarningLevel="3"
 				WarnAsError="TRUE"
 				SuppressStartupBanner="TRUE"
@@ -36,11 +40,11 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile=".\Debug/strgen.exe"
+				OutputFile="$(OutDir)\strgen.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\Debug/strgen.pdb"
+				ProgramDatabaseFile="$(OutDir)\strgen.pdb"
 				SubSystem="1"
 				TargetMachine="1"/>
 			<Tool
@@ -76,12 +80,27 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
 			<File
-				RelativePath="strgen.c">
+				RelativePath="..\src\strgen\strgen.c">
 			</File>
 			<File
-				RelativePath="..\string.c">
+				RelativePath="..\src\string.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+				</FileConfiguration>
 			</File>
 		</Filter>
+		<File
+			RelativePath="..\src\macros.h">
+		</File>
+		<File
+			RelativePath="..\src\stdafx.h">
+		</File>
+		<File
+			RelativePath="..\src\string.h">
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/strgen/strgen_vs80.vcproj b/projects/strgen_vs80.vcproj
index 67df2e0ce..db9f59f82 100644
--- a/strgen/strgen_vs80.vcproj
+++ b/projects/strgen_vs80.vcproj
@@ -4,6 +4,7 @@
 	Version="8.00"
 	Name="strgen"
 	ProjectGUID="{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}"
+	RootNamespace="strgen"
 	>
 	<Platforms>
 		<Platform
@@ -15,8 +16,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
+			OutputDirectory="..\objs\strgen"
+			IntermediateDirectory="..\objs\strgen"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -42,14 +43,17 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;STRGEN"
-				BasicRuntimeChecks="3"
+				Optimization="1"
+				GlobalOptimizations="TRUE"
+				FavorSizeOrSpeed="2"
+				PreprocessorDefinitions="STRGEN;WIN32;_DEBUG;_CONSOLE"
+				BasicRuntimeChecks="0"
 				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\Debug/strgen.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
+				PrecompiledHeaderFile=""
+				AssemblerOutput="2"
+				AssemblerListingLocation="$(IntDir)/"
+				ObjectFile="$(IntDir)/"
+				ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"
 				WarningLevel="3"
 				WarnAsError="true"
 				SuppressStartupBanner="true"
@@ -68,11 +72,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile=".\Debug/strgen.exe"
+				OutputFile="$(IntDir)\strgen.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\Debug/strgen.pdb"
+				ProgramDatabaseFile="$(IntDir)\strgen.pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>
@@ -110,13 +114,32 @@
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
 			<File
-				RelativePath="strgen.c"
+				RelativePath="..\src\strgen\strgen.c"
 				>
 			</File>
 			<File
-				RelativePath="..\string.c">
-			</File>
+				RelativePath="..\src\string.c"
+				>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+					</FileConfiguration>
+				</File>
 		</Filter>
+		<File
+			RelativePath="..\src\macros.h"
+			>
+		</File>
+		<File
+			RelativePath="..\src\stdafx.h"
+			>
+		</File>
+		<File
+			RelativePath="..\src\string.h"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/readme.txt b/readme.txt
index 25850aee4..bf27d2787 100644
--- a/readme.txt
+++ b/readme.txt
@@ -148,25 +148,29 @@ Windows:
 
 Unix:
   OpenTTD can be built with GNU "make". On non-GNU systems it's called "gmake".
+  However, for the first build one has to do a "./configure" first.
   Note that you need SDL-devel 1.2.5 (or higher) to compile OpenTTD.
 
 MacOS X:
   Use "make" or Xcode (which will then call make for you)
   This will give you a binary for your CPU type (PPC/Intel)
-  To make a universal binary type "make UNIVERSAL_BINARY:=1"
+  However, for the first build one has to do a "./configure" first.
+  To make a universal binary type "./configure --enabled-universal"
+  instead of "./configure".
 
 BeOS:
-  Use "make".
+  Use "make", but do a "./configure" before the first build.
 
 FreeBSD:
   You need the port devel/sdl12 for a non-dedicated build.
   graphics/png is optional for screenshots in the PNG format.
-  Use "gmake".
+  Use "gmake", but do a "./configure" before the first build.
 
 MorphOS:
-  Use "make". Note that you need the MorphOS SDK, latest libnix updates (else
-  C++ parts of OpenTTD will not build) and the powersdl.library SDK. Optionally
-  libz, libpng and freetype2 developer files.
+  Use "make". However, for the first build one has to do a "./configure" first.
+  Note that you need the MorphOS SDK, latest libnix updates (else C++ parts of
+  OpenTTD will not build) and the powersdl.library SDK. Optionally libz,
+  libpng and freetype2 developer files.
 
 OS/2:
   Open Watcom C/C++ 1.3 or later is required to build the OS/2 version. See the
diff --git a/source.list b/source.list
new file mode 100644
index 000000000..b88dba0b1
--- /dev/null
+++ b/source.list
@@ -0,0 +1,372 @@
+# Source Files
+airport.c
+aystar.c
+bmp.c
+callback_table.c
+command.c
+console.c
+console_cmds.c
+currency.c
+date.c
+debug.c
+dedicated.c
+depot.c
+driver.c
+economy.c
+elrail.c
+engine.c
+fileio.c
+fios.c
+fontcache.c
+genworld.c
+gfx.c
+gfxinit.c
+heightmap.c
+helpers.cpp
+landscape.c
+map.c
+md5.c
+mersenne.c
+minilzo.c
+misc.c
+mixer.c
+music.c
+namegen.c
+network/core/packet.c
+network/core/tcp.c
+network/core/udp.c
+network/network.c
+network/network_client.c
+network/network_data.c
+network/network_gamelist.c
+network/network_server.c
+network/network_udp.c
+npf.c
+oldloader.c
+oldpool.c
+openttd.c
+os_timer.c
+#if WIN32
+	ottdres.rc
+#end
+pathfind.c
+players.c
+queue.c
+rail.c
+saveload.c
+screenshot.c
+#if SDL
+	sdl.c
+#end
+settings.c
+signs.c
+sound.c
+spritecache.c
+string.c
+strings.c
+texteff.c
+tgp.c
+thread.c
+tile.c
+#if WIN32
+#else
+	unix.c
+#end
+vehicle.c
+viewport.c
+waypoint.c
+widget.c
+#if WIN32
+	win32.c
+#end
+window.c
+
+# Header Files
+airport.h
+airport_movement.h
+aystar.h
+bmp.h
+command.h
+console.h
+currency.h
+date.h
+debug.h
+video/dedicated_v.h
+depot.h
+music/dmusic.h
+driver.h
+economy.h
+engine.h
+fontcache.h
+fileio.h
+fios.h
+functions.h
+genworld.h
+gfx.h
+gfxinit.h
+gui.h
+hal.h
+heightmap.h
+industry.h
+livery.h
+macros.h
+map.h
+md5.h
+mixer.h
+music.h
+network/core/config.h
+network/core/game.h
+network/core/os_abstraction.h
+network/core/packet.h
+network/core/tcp.h
+network/core/udp.h
+network/network.h
+network/network_client.h
+network/network_data.h
+network/network_gamelist.h
+network/network_gui.h
+network/network_server.h
+network/network_udp.h
+newgrf.h
+newgrf_callbacks.h
+newgrf_cargo.h
+newgrf_config.h
+newgrf_engine.h
+newgrf_sound.h
+newgrf_spritegroup.h
+newgrf_station.h
+newgrf_text.h
+news.h
+npf.h
+music/null_m.h
+sound/null_s.h
+video/null_v.h
+oldpool.h
+openttd.h
+pathfind.h
+player.h
+queue.h
+rail.h
+road_cmd.h
+saveload.h
+screenshot.h
+sound/sdl_s.h
+video/sdl_v.h
+settings.h
+signs.h
+slope.h
+sound.h
+sprite.h
+station.h
+stdafx.h
+string.h
+tgp.h
+thread.h
+tile.h
+town.h
+train.h
+variables.h
+vehicle.h
+vehicle_gui.h
+viewport.h
+waypoint.h
+music/win32_m.h
+sound/win32_s.h
+video/win32_v.h
+window.h
+
+# GUI Source Code
+aircraft_gui.c
+airport_gui.c
+bridge_gui.c
+build_vehicle_gui.c
+depot_gui.c
+dock_gui.c
+engine_gui.c
+genworld_gui.c
+graph_gui.c
+industry_gui.c
+intro_gui.c
+main_gui.c
+misc_gui.c
+music_gui.c
+network/network_gui.c
+newgrf_gui.c
+news_gui.c
+order_gui.c
+player_gui.c
+rail_gui.c
+road_gui.c
+roadveh_gui.c
+settings_gui.c
+ship_gui.c
+smallmap_gui.c
+station_gui.c
+subsidy_gui.c
+terraform_gui.c
+town_gui.c
+train_gui.c
+vehicle_gui.c
+
+# Landscape
+aircraft_cmd.c
+clear_cmd.c
+disaster_cmd.c
+dummy_land.c
+industry_cmd.c
+misc_cmd.c
+order_cmd.c
+rail_cmd.c
+road_cmd.c
+roadveh_cmd.c
+ship_cmd.c
+station_cmd.c
+town_cmd.c
+train_cmd.c
+tree_cmd.c
+tunnelbridge_cmd.c
+unmovable_cmd.c
+water_cmd.c
+
+# Tables
+table/ai_rail.h
+table/allstrings.h
+table/animcursors.h
+table/autorail.h
+table/build_industry.h
+table/clear_land.h
+table/elrail_data.h
+table/engines.h
+table/genland.h
+table/industry_land.h
+table/landscape_const.h
+table/landscape_sprite.h
+table/namegen.h
+table/palettes.h
+table/road_land.h
+table/roadveh.h
+table/sprites.h
+table/station_land.h
+table/strings.h
+table/town_land.h
+table/track_land.h
+table/train_cmd.h
+table/tree_land.h
+table/tunnel_land.h
+table/unmovable_land.h
+table/water_land.h
+
+# AI Files
+ai/ai.c
+ai/default/default.c
+ai/trolly/build.c
+ai/trolly/pathfinder.c
+ai/trolly/shared.c
+ai/trolly/trolly.c
+
+# NewGRF
+newgrf.c
+newgrf_cargo.c
+newgrf_config.c
+newgrf_engine.c
+newgrf_sound.c
+newgrf_spritegroup.c
+newgrf_station.c
+newgrf_text.c
+
+# Map Accessors
+bridge_map.c
+bridge_map.h
+clear_map.h
+industry_map.h
+rail_map.h
+road_map.c
+road_map.h
+station_map.c
+station_map.h
+town_map.h
+tree_map.h
+tunnel_map.c
+tunnel_map.h
+unmovable_map.h
+void_map.h
+water_map.h
+
+# YAPF
+yapf/array.hpp
+yapf/autocopyptr.hpp
+yapf/binaryheap.hpp
+yapf/blob.hpp
+yapf/countedptr.hpp
+yapf/crc32.hpp
+yapf/fixedsizearray.hpp
+yapf/follow_track.cpp
+yapf/follow_track.hpp
+yapf/hashtable.hpp
+yapf/nodelist.hpp
+yapf/track_dir.hpp
+yapf/yapf.h
+yapf/yapf.hpp
+yapf/yapf_base.hpp
+yapf/yapf_common.cpp
+yapf/yapf_common.hpp
+yapf/yapf_costbase.hpp
+yapf/yapf_costcache.hpp
+yapf/yapf_costrail.hpp
+yapf/yapf_destrail.hpp
+yapf/yapf_node.hpp
+yapf/yapf_node_rail.hpp
+yapf/yapf_node_road.hpp
+yapf/yapf_rail.cpp
+yapf/yapf_road.cpp
+yapf/yapf_settings.h
+yapf/yapf_ship.cpp
+
+# Video
+video/dedicated_v.c
+video/null_v.c
+#if SDL
+	video/sdl_v.c
+#end
+#if WIN32
+	video/win32_v.c
+#end
+
+# Music
+#if DIRECTMUSIC
+	music/dmusic.cpp
+#end
+music/null_m.c
+#if WIN32
+	music/win32_m.c
+#else
+	music/extmidi.c
+#end
+#if BEOS
+ 	music/bemidi.cpp
+#end
+
+# Sound
+sound/null_s.c
+#if SDL
+	sound/sdl_s.c
+#end
+#if WIN32
+	sound/win32_s.c
+#end
+
+#if OSX
+# OSX Files
+	os/macosx/macos.m
+
+	#if DEDICATED
+	#else
+		music/qtmidi.c
+	#end
+
+	#if COCOA
+		video/cocoa_v.m
+		sound/cocoa_s.c
+		os/macosx/splash.c
+	#end
+#end
diff --git a/ai/ai.c b/src/ai/ai.c
index 58b97ad39..58b97ad39 100644
--- a/ai/ai.c
+++ b/src/ai/ai.c
diff --git a/ai/ai.h b/src/ai/ai.h
index 6123970ac..6123970ac 100644
--- a/ai/ai.h
+++ b/src/ai/ai.h
diff --git a/ai/default/default.c b/src/ai/default/default.c
index 143e724b9..143e724b9 100644
--- a/ai/default/default.c
+++ b/src/ai/default/default.c
diff --git a/ai/default/default.h b/src/ai/default/default.h
index d367d4a72..d367d4a72 100644
--- a/ai/default/default.h
+++ b/src/ai/default/default.h
diff --git a/ai/trolly/build.c b/src/ai/trolly/build.c
index 9959d0d04..9959d0d04 100644
--- a/ai/trolly/build.c
+++ b/src/ai/trolly/build.c
diff --git a/ai/trolly/pathfinder.c b/src/ai/trolly/pathfinder.c
index 6ffdf1fec..6ffdf1fec 100644
--- a/ai/trolly/pathfinder.c
+++ b/src/ai/trolly/pathfinder.c
diff --git a/ai/trolly/shared.c b/src/ai/trolly/shared.c
index e683b60ea..e683b60ea 100644
--- a/ai/trolly/shared.c
+++ b/src/ai/trolly/shared.c
diff --git a/ai/trolly/trolly.c b/src/ai/trolly/trolly.c
index d67a064b4..35115a880 100644
--- a/ai/trolly/trolly.c
+++ b/src/ai/trolly/trolly.c
@@ -23,7 +23,7 @@
 #include "../../functions.h"
 #include "../../road_map.h"
 #include "../../station_map.h"
-#include "../../table/strings.h"
+#include "table/strings.h"
 #include "../../map.h"
 #include "../../tile.h"
 #include "../../command.h"
diff --git a/ai/trolly/trolly.h b/src/ai/trolly/trolly.h
index e0d70fbf6..e0d70fbf6 100644
--- a/ai/trolly/trolly.h
+++ b/src/ai/trolly/trolly.h
diff --git a/aircraft.h b/src/aircraft.h
index 15d2bbe27..15d2bbe27 100644
--- a/aircraft.h
+++ b/src/aircraft.h
diff --git a/aircraft_cmd.c b/src/aircraft_cmd.c
index bbc3aa4db..bbc3aa4db 100644
--- a/aircraft_cmd.c
+++ b/src/aircraft_cmd.c
diff --git a/aircraft_gui.c b/src/aircraft_gui.c
index ded25b463..ded25b463 100644
--- a/aircraft_gui.c
+++ b/src/aircraft_gui.c
diff --git a/airport.c b/src/airport.c
index 2135bd11b..2135bd11b 100644
--- a/airport.c
+++ b/src/airport.c
diff --git a/airport.h b/src/airport.h
index 2dcbd1660..2dcbd1660 100644
--- a/airport.h
+++ b/src/airport.h
diff --git a/airport_gui.c b/src/airport_gui.c
index c049d50d5..c049d50d5 100644
--- a/airport_gui.c
+++ b/src/airport_gui.c
diff --git a/airport_movement.h b/src/airport_movement.h
index 1ca00ed75..1ca00ed75 100644
--- a/airport_movement.h
+++ b/src/airport_movement.h
diff --git a/aystar.c b/src/aystar.c
index 0000d584c..0000d584c 100644
--- a/aystar.c
+++ b/src/aystar.c
diff --git a/aystar.h b/src/aystar.h
index 4920a37d4..4920a37d4 100644
--- a/aystar.h
+++ b/src/aystar.h
diff --git a/bmp.c b/src/bmp.c
index c2bd91270..c2bd91270 100644
--- a/bmp.c
+++ b/src/bmp.c
diff --git a/bmp.h b/src/bmp.h
index 0587bab65..0587bab65 100644
--- a/bmp.h
+++ b/src/bmp.h
diff --git a/bridge.h b/src/bridge.h
index 7a63e28d7..7a63e28d7 100644
--- a/bridge.h
+++ b/src/bridge.h
diff --git a/bridge_gui.c b/src/bridge_gui.c
index f426da18e..f426da18e 100644
--- a/bridge_gui.c
+++ b/src/bridge_gui.c
diff --git a/bridge_map.c b/src/bridge_map.c
index 8e2405ea3..8e2405ea3 100644
--- a/bridge_map.c
+++ b/src/bridge_map.c
diff --git a/bridge_map.h b/src/bridge_map.h
index 1cda0da9d..1cda0da9d 100644
--- a/bridge_map.h
+++ b/src/bridge_map.h
diff --git a/build_vehicle_gui.c b/src/build_vehicle_gui.c
index b293b516c..b293b516c 100644
--- a/build_vehicle_gui.c
+++ b/src/build_vehicle_gui.c
diff --git a/callback_table.c b/src/callback_table.c
index 65e140742..65e140742 100644
--- a/callback_table.c
+++ b/src/callback_table.c
diff --git a/callback_table.h b/src/callback_table.h
index f555fcf60..f555fcf60 100644
--- a/callback_table.h
+++ b/src/callback_table.h
diff --git a/clear_cmd.c b/src/clear_cmd.c
index 4d1a78ba9..4d1a78ba9 100644
--- a/clear_cmd.c
+++ b/src/clear_cmd.c
diff --git a/clear_map.h b/src/clear_map.h
index 50ae63b1b..50ae63b1b 100644
--- a/clear_map.h
+++ b/src/clear_map.h
diff --git a/command.c b/src/command.c
index f99371946..f99371946 100644
--- a/command.c
+++ b/src/command.c
diff --git a/command.h b/src/command.h
index d46c771dd..d46c771dd 100644
--- a/command.h
+++ b/src/command.h
diff --git a/src/configure b/src/configure
new file mode 100755
index 000000000..2fd293954
--- /dev/null
+++ b/src/configure
@@ -0,0 +1,323 @@
+#!/bin/sh
+
+# This 'configure' script is a very easy wrapper around 'make updateconf'
+#  It allows cross-compilers to do their job much more easy.
+
+function showhelp() {
+	echo "Configure for OpenTTD"
+	echo ""
+	echo "Usage:"
+	echo " $0 --your_options"
+	echo ""
+	echo "Params:"
+	echo " --debug             Create debug-release                [no]"
+	echo " --profile           Create profile-release              [no]"
+	echo " --dedicated         Make a dedicated build              [no]"
+	echo " --revision          Set the revision of the compilation [detected]"
+	echo " --target-cc         Sets the target-compiler            [\$CC]"
+	echo " --target-cxx        Sets the C++ target-compiler        []"
+	echo " --host-cc           Sets the host-compiler              [\$CC]"
+	echo " --host-cxx          Sets the C++ host-compiler          []"
+	echo " --os                Sets the OS. Listens to:            [detected]"
+	echo "                        UNIX, OSX, FREEBSD, MORPHOS"
+	echo "                        BEOS, SUNOS, CYGWIN, MINGW, OS2"
+	echo " --windres           Sets the windres (Windows)          [windres]"
+	echo " --force-le          Force LE platform                   [no]"
+	echo " --force-be          Force BE platform                   [no]"
+	echo ""
+	echo "Params that can be used with --with or --without"
+	echo "   (e.g.: --without-static disables static (default))"
+	echo " static              Do you want a static build?         [no]"
+	echo " directmusic         Do you want direct-music?           [no]"
+	echo " zlib                Do you want zlib-support?           [yes]"
+	echo " sdl                 Do you want SDL-support?            [yes]"
+	echo " png                 Do you want PNG-support?            [yes]"
+	echo " iconv               Do you want iconv-support?          [no]"
+	echo " network             Do you want network-support?        [yes]"
+	echo " cocoa               Do you want cocoa-support? (MacOSX) [no]"
+	echo " freetype            Do you want freetype-support?       [yes]"
+	echo " fontconfig          Do you want fontconfig-support?     [yes]"
+	echo ""
+	echo "Params used to configure external libs:"
+	echo " --static-zlib-path  Set the path to your static zlib    []"
+	echo " --sdl-config        Where is your sdl-config            [sdl-config]"
+	echo " --libpng-config     Where is your libpng-config         [libpng-config]"
+	echo " --freetype-config   Where is your freetype-config       [freetype-config]"
+	echo " --fontconfig-config Where is your fontconfig-config     [pkg-config fontconfig]"
+	echo " --with-iconv        Set the path to your iconv headers  []"
+	echo " "
+}
+
+function handle() {
+	PARAM="$PARAM \"$1=`awk 'BEGIN { FS="="; $0="'"$2"'"; print $2;}'`\""
+}
+
+# The things you can use inside this case:
+#  handle NAME VALUE - Sets the value to give the 'make upgradeconf'
+#                         Value is in form: tag=REAL_VALUE
+#  ITEM="NAME"       - Will set the value as above, only with the next param
+#  SITEM="NAME"      - Will set the var $NAME to the next param
+for n in "$@"
+do
+	case "$n" in
+		--help | -h)
+			showhelp
+			exit 0
+			;;
+
+		--debug)
+			DEBUG_SET=1
+			ITEM="DEBUG"
+			;;
+		--debug=*)
+			handle "DEBUG" "$n"
+			;;
+		--profile)
+			PARAM="$PARAM PROFILE=1"
+			;;
+		--dedicated)
+			PARAM="$PARAM DEDICATED=1"
+			;;
+		--revision=*)
+			RELEASE=`awk 'BEGIN { FS="="; $0="'"$n"'"; print $2;}'`
+			;;
+		--revision)
+			SITEM="RELEASE"
+			;;
+		--target-cc=*)
+			handle "CC_TARGET" "$n"
+			;;
+		--target-cc)
+			ITEM="CC_TARGET"
+			;;
+		--target-cxx=*)
+			handle "CXX_TARGET" "$n"
+			;;
+		--target-cxx)
+			SITEM="CXX_TARGET"
+			;;
+		--host-cc=*)
+			handle "CC_HOST" "$n"
+			;;
+		--host-cc)
+			ITEM="CC_HOST"
+			;;
+		--host-cxx=*)
+			handle "CXX_HOST" "$n"
+			;;
+		--host-cxx)
+			ITEM="CXX_HOST"
+			;;
+		--host-cflags=*)
+			handle CFLAGS_HOST "$n"
+			;;
+		--host-cflags)
+			ITEM="CFLAGS_HOST"
+			;;
+		--os=*)
+			TARGET_OS=`awk 'BEGIN { FS="="; $0="'"$n"'"; print $2;}'`
+			;;
+		--os)
+			SITEM="TARGET_OS"
+			;;
+		--windres=*)
+			handle WINDRES "$n"
+			;;
+		--windres)
+			ITEM="WINDRES"
+			;;
+		--force-le)
+			PARAM="$PARAM ENDIAN_FORCE=LE"
+			;;
+		--force-be)
+			PARAM="$PARAM ENDIAN_FORCE=BE"
+			;;
+
+		--with-static)
+			PARAM="$PARAM STATIC=1"
+			;;
+		--without-static)
+			PARAM="$PARAM STATIC="
+			;;
+		--with-directmusic)
+			PARAM="$PARAM WITH_DIRECTMUSIC=1"
+			;;
+		--without-directmusic)
+			PARAM="$PARAM WITH_DIRECTMUSIC="
+			;;
+		--with-zlib)
+			PARAM="$PARAM WITH_ZLIB=1"
+			;;
+		--without-zlib)
+			PARAM="$PARAM WITH_ZLIB="
+			;;
+		--with-sdl)
+			PARAM="$PARAM WITH_SDL=1"
+			;;
+		--without-sdl)
+			PARAM="$PARAM WITH_SDL="
+			;;
+		--with-png)
+			PARAM="$PARAM WITH_PNG=1"
+			;;
+		--without-png)
+			PARAM="$PARAM WITH_PNG="
+			;;
+		--with-iconv)
+			PARAM="$PARAM WITH_ICONV=1"
+			;;
+		--with-iconv=*)
+			PARAM="$PARAM WITH_ICONV=1"
+			handle WITH_ICONV_PATH "$n"
+			;;
+		--without-iconv)
+			PARAM="$PARAM WITH_ICONV="
+			;;
+		--with-cocoa)
+			PARAM="$PARAM WITH_COCOA=1"
+			;;
+		--with-network)
+			PARAM="$PARAM WITH_NETWORK=1"
+			;;
+		--without-network)
+			PARAM="$PARAM WITH_NETWORK="
+			;;
+		--without-cocoa)
+			PARAM="$PARAM WITH_COCOA="
+			;;
+		--with-freetype)
+			PARAM="$PARAM WITH_FREETYPE=1"
+			;;
+		--without-freetype)
+			PARAM="$PARAM WITH_FREETYPE="
+			;;
+		--with-fontconfig)
+			PARAM="$PARAM WITH_FONTCONFIG=1"
+			;;
+		--without-fontconfig)
+			PARAM="$PARAM WITH_FONTCONFIG="
+			;;
+		--static-zlib-path=*)
+			handle STATIC_ZLIB_PATH "$n"
+			;;
+		--static-zlib-path)
+			ITEM="STATIC_ZLIB_PATH"
+			;;
+		--sdl-config=*)
+			handle SDL_CONFIG "$n"
+			;;
+		--sdl-config)
+			ITEM="SDL_CONFIG"
+			;;
+		--libpng-config=*)
+			handle LIBPNG_CONFIG "$n"
+			;;
+		--libpng-config)
+			ITEM="LIBPNG_CONFIG"
+			;;
+		--freetype-config=*)
+			handle FREETYPE_CONFIG "$n"
+			;;
+		--freetype-config)
+			ITEM="FREETYPE_CONFIG"
+			;;
+		--fontconfig-config=*)
+			handle FONTCONFIG_CONFIG "$n"
+			;;
+		--fontconfig-config)
+			ITEM="FONTCONFIG_CONFIG"
+			;;
+
+		--*=*)
+			echo -n "Unknown switch "
+			echo `awk 'BEGIN { FS="="; $0="'"$n"'"; print $1;}'`
+			exit 1
+			;;
+		-*)
+			echo "Unknown switch $n"
+			exit 1
+			;;
+
+		*)
+			if ! test -z "$ITEM"
+			then
+				PARAM="$PARAM $ITEM=\"$n\""
+				ITEM="";
+			elif ! test -z "$SITEM"
+			then
+				export $SITEM="$n"
+				SITEM=""
+			else
+				echo "Unknown switch $n"
+				exit 1
+			fi
+			;;
+	esac
+done
+
+if ! test -z "$TARGET_OS"
+then
+	TARGET_OS=`echo $TARGET_OS | tr '[:lower:]' '[:upper:]'`
+	case "$TARGET_OS" in
+		WIN32)
+			PARAM="$PARAM WIN32=1"
+			;;
+		UNIX)
+			PARAM="$PARAM UNIX=1"
+			;;
+		OSX)
+			PARAM="$PARAM OSX=1 UNIX=1"
+			;;
+		FREEBSD)
+			PARAM="$PARAM FREEBSD=1"
+			;;
+		MORPHOS)
+			PARAM="$PARAM MORPHOS=1 UNIX=1"
+			;;
+		BEOS)
+			PARAM="$PARAM BEOS=1 UNIX=1"
+			;;
+		OS2)
+			PARAM="$PARAM OS2=1 UNIX=1"
+			;;
+		SUNOS)
+			PARAM="$PARAM SUNOS=1 UNIX=1"
+			;;
+		CYGWIN)
+			PARAM="$PARAM CYGWIN=1 WIN32=1"
+			;;
+		MINGW)
+			PARAM="$PARAM MINGW=1 WIN32=1"
+			;;
+		*)
+			echo "Unknown OS: $TARGET_OS"
+			exit 1
+			;;
+	esac
+	PARAM="$PARAM BYPASS_OS_DETECT=1"
+fi
+
+if ! test -z "$DEBUG_SET"
+then
+	if test -z "`echo $PARAM | grep "DEBUG="`"
+	then
+		# Someone did --debug, without assigning a value, assume 1
+		PARAM="$PARAM DEBUG=1"
+	fi
+fi
+
+# First remove the Makefile.config, else you can have double entries
+rm -f Makefile.config
+
+echo "make upgradeconf $PARAM" > Makefile.run
+. Makefile.run
+rm -f Makefile.run
+
+# Makefile.config currently doesn't support custom RELEASE (revision), so, we add the line
+# yourself!
+
+if ! test -z "$RELEASE"
+then
+	echo "RELEASE=$RELEASE" >> Makefile.config
+fi
+
diff --git a/console.c b/src/console.c
index 07d218130..07d218130 100644
--- a/console.c
+++ b/src/console.c
diff --git a/console.h b/src/console.h
index ef8063bc8..ef8063bc8 100644
--- a/console.h
+++ b/src/console.h
diff --git a/console_cmds.c b/src/console_cmds.c
index 7ec55c6b9..7ec55c6b9 100644
--- a/console_cmds.c
+++ b/src/console_cmds.c
diff --git a/currency.c b/src/currency.c
index 7bc81139a..7bc81139a 100644
--- a/currency.c
+++ b/src/currency.c
diff --git a/currency.h b/src/currency.h
index 40fb553a4..40fb553a4 100644
--- a/currency.h
+++ b/src/currency.h
diff --git a/date.c b/src/date.c
index 856ca4528..856ca4528 100644
--- a/date.c
+++ b/src/date.c
diff --git a/date.h b/src/date.h
index 488a9dc3a..488a9dc3a 100644
--- a/date.h
+++ b/src/date.h
diff --git a/debug.c b/src/debug.c
index 536d21c6a..536d21c6a 100644
--- a/debug.c
+++ b/src/debug.c
diff --git a/debug.h b/src/debug.h
index c99795ddd..c99795ddd 100644
--- a/debug.h
+++ b/src/debug.h
diff --git a/dedicated.c b/src/dedicated.c
index 1905fa498..1905fa498 100644
--- a/dedicated.c
+++ b/src/dedicated.c
diff --git a/depot.c b/src/depot.c
index 49fdfa21c..49fdfa21c 100644
--- a/depot.c
+++ b/src/depot.c
diff --git a/depot.h b/src/depot.h
index 7cf25a1b1..7cf25a1b1 100644
--- a/depot.h
+++ b/src/depot.h
diff --git a/depot_gui.c b/src/depot_gui.c
index d929696b8..d929696b8 100644
--- a/depot_gui.c
+++ b/src/depot_gui.c
diff --git a/direction.h b/src/direction.h
index 477c34046..477c34046 100644
--- a/direction.h
+++ b/src/direction.h
diff --git a/disaster_cmd.c b/src/disaster_cmd.c
index 2d4579b52..2d4579b52 100644
--- a/disaster_cmd.c
+++ b/src/disaster_cmd.c
diff --git a/dock_gui.c b/src/dock_gui.c
index 8e550e9ec..8e550e9ec 100644
--- a/dock_gui.c
+++ b/src/dock_gui.c
diff --git a/driver.c b/src/driver.c
index d8f4f1f15..d8f4f1f15 100644
--- a/driver.c
+++ b/src/driver.c
diff --git a/driver.h b/src/driver.h
index 4e25714f7..4e25714f7 100644
--- a/driver.h
+++ b/src/driver.h
diff --git a/dummy_land.c b/src/dummy_land.c
index 10952fc00..10952fc00 100644
--- a/dummy_land.c
+++ b/src/dummy_land.c
diff --git a/economy.c b/src/economy.c
index bcd3ac552..bcd3ac552 100644
--- a/economy.c
+++ b/src/economy.c
diff --git a/economy.h b/src/economy.h
index 823e167c8..823e167c8 100644
--- a/economy.h
+++ b/src/economy.h
diff --git a/elrail.c b/src/elrail.c
index da043b582..da043b582 100644
--- a/elrail.c
+++ b/src/elrail.c
diff --git a/endian_check.c b/src/endian_check.c
index a302ea40b..a302ea40b 100644
--- a/endian_check.c
+++ b/src/endian_check.c
diff --git a/engine.c b/src/engine.c
index 0a4b21c3d..0a4b21c3d 100644
--- a/engine.c
+++ b/src/engine.c
diff --git a/engine.h b/src/engine.h
index 2fa6b9eb0..2fa6b9eb0 100644
--- a/engine.h
+++ b/src/engine.h
diff --git a/engine_gui.c b/src/engine_gui.c
index 31f175cf1..31f175cf1 100644
--- a/engine_gui.c
+++ b/src/engine_gui.c
diff --git a/fileio.c b/src/fileio.c
index 2a09916ea..2a09916ea 100644
--- a/fileio.c
+++ b/src/fileio.c
diff --git a/fileio.h b/src/fileio.h
index 6ee58b32c..6ee58b32c 100644
--- a/fileio.h
+++ b/src/fileio.h
diff --git a/fios.c b/src/fios.c
index 950e26a23..950e26a23 100644
--- a/fios.c
+++ b/src/fios.c
diff --git a/fios.h b/src/fios.h
index 85d0b6041..85d0b6041 100644
--- a/fios.h
+++ b/src/fios.h
diff --git a/fontcache.c b/src/fontcache.c
index d555eea94..d555eea94 100644
--- a/fontcache.c
+++ b/src/fontcache.c
diff --git a/fontcache.h b/src/fontcache.h
index 249f35cd0..249f35cd0 100644
--- a/fontcache.h
+++ b/src/fontcache.h
diff --git a/functions.h b/src/functions.h
index 0529c1646..0529c1646 100644
--- a/functions.h
+++ b/src/functions.h
diff --git a/genworld.c b/src/genworld.c
index ba9fe126f..ba9fe126f 100644
--- a/genworld.c
+++ b/src/genworld.c
diff --git a/genworld.h b/src/genworld.h
index 0cf67cbe6..0cf67cbe6 100644
--- a/genworld.h
+++ b/src/genworld.h
diff --git a/genworld_gui.c b/src/genworld_gui.c
index 83d0f4cf1..83d0f4cf1 100644
--- a/genworld_gui.c
+++ b/src/genworld_gui.c
diff --git a/gfx.c b/src/gfx.c
index 1d48fa25d..1d48fa25d 100644
--- a/gfx.c
+++ b/src/gfx.c
diff --git a/gfx.h b/src/gfx.h
index 8636a36a6..8636a36a6 100644
--- a/gfx.h
+++ b/src/gfx.h
diff --git a/gfxinit.c b/src/gfxinit.c
index ae9fb3cb8..ae9fb3cb8 100644
--- a/gfxinit.c
+++ b/src/gfxinit.c
diff --git a/gfxinit.h b/src/gfxinit.h
index d3873ff23..d3873ff23 100644
--- a/gfxinit.h
+++ b/src/gfxinit.h
diff --git a/graph_gui.c b/src/graph_gui.c
index c6a9b845b..c6a9b845b 100644
--- a/graph_gui.c
+++ b/src/graph_gui.c
diff --git a/gui.h b/src/gui.h
index 8ca055f43..8ca055f43 100644
--- a/gui.h
+++ b/src/gui.h
diff --git a/hal.h b/src/hal.h
index 1b239162b..1b239162b 100644
--- a/hal.h
+++ b/src/hal.h
diff --git a/heightmap.c b/src/heightmap.c
index aeaa5c38e..aeaa5c38e 100644
--- a/heightmap.c
+++ b/src/heightmap.c
diff --git a/heightmap.h b/src/heightmap.h
index d7592bf27..d7592bf27 100644
--- a/heightmap.h
+++ b/src/heightmap.h
diff --git a/helpers.cpp b/src/helpers.cpp
index b78df5de8..b78df5de8 100644
--- a/helpers.cpp
+++ b/src/helpers.cpp
diff --git a/industry.h b/src/industry.h
index f8cf63c82..f8cf63c82 100644
--- a/industry.h
+++ b/src/industry.h
diff --git a/industry_cmd.c b/src/industry_cmd.c
index 38e2c516b..38e2c516b 100644
--- a/industry_cmd.c
+++ b/src/industry_cmd.c
diff --git a/industry_gui.c b/src/industry_gui.c
index 3e481ef88..3e481ef88 100644
--- a/industry_gui.c
+++ b/src/industry_gui.c
diff --git a/industry_map.h b/src/industry_map.h
index 5a3512fd3..5a3512fd3 100644
--- a/industry_map.h
+++ b/src/industry_map.h
diff --git a/intro_gui.c b/src/intro_gui.c
index 5f78e3a65..5f78e3a65 100644
--- a/intro_gui.c
+++ b/src/intro_gui.c
diff --git a/landscape.c b/src/landscape.c
index 2d8b7205b..2d8b7205b 100644
--- a/landscape.c
+++ b/src/landscape.c
diff --git a/lang/american.txt b/src/lang/american.txt
index fc169eb4c..fc169eb4c 100644
--- a/lang/american.txt
+++ b/src/lang/american.txt
diff --git a/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt
index 580206fa6..580206fa6 100644
--- a/lang/brazilian_portuguese.txt
+++ b/src/lang/brazilian_portuguese.txt
diff --git a/lang/bulgarian.txt b/src/lang/bulgarian.txt
index 85eb15c61..85eb15c61 100644
--- a/lang/bulgarian.txt
+++ b/src/lang/bulgarian.txt
diff --git a/lang/catalan.txt b/src/lang/catalan.txt
index de2e07037..de2e07037 100644
--- a/lang/catalan.txt
+++ b/src/lang/catalan.txt
diff --git a/lang/czech.txt b/src/lang/czech.txt
index 844470393..844470393 100644
--- a/lang/czech.txt
+++ b/src/lang/czech.txt
diff --git a/lang/danish.txt b/src/lang/danish.txt
index a89be00ae..a89be00ae 100644
--- a/lang/danish.txt
+++ b/src/lang/danish.txt
diff --git a/lang/dutch.txt b/src/lang/dutch.txt
index 67e4f99e0..67e4f99e0 100644
--- a/lang/dutch.txt
+++ b/src/lang/dutch.txt
diff --git a/lang/english.txt b/src/lang/english.txt
index 8a5ff5cd7..8a5ff5cd7 100644
--- a/lang/english.txt
+++ b/src/lang/english.txt
diff --git a/lang/esperanto.txt b/src/lang/esperanto.txt
index 9044454cc..9044454cc 100644
--- a/lang/esperanto.txt
+++ b/src/lang/esperanto.txt
diff --git a/lang/estonian.txt b/src/lang/estonian.txt
index 37dda07e9..37dda07e9 100644
--- a/lang/estonian.txt
+++ b/src/lang/estonian.txt
diff --git a/lang/finnish.txt b/src/lang/finnish.txt
index 99de13d43..99de13d43 100644
--- a/lang/finnish.txt
+++ b/src/lang/finnish.txt
diff --git a/lang/french.txt b/src/lang/french.txt
index 2a54e96c9..2a54e96c9 100644
--- a/lang/french.txt
+++ b/src/lang/french.txt
diff --git a/lang/galician.txt b/src/lang/galician.txt
index c5c258457..c5c258457 100644
--- a/lang/galician.txt
+++ b/src/lang/galician.txt
diff --git a/lang/german.txt b/src/lang/german.txt
index f07130d75..f07130d75 100644
--- a/lang/german.txt
+++ b/src/lang/german.txt
diff --git a/lang/hungarian.txt b/src/lang/hungarian.txt
index df4ca5a67..df4ca5a67 100644
--- a/lang/hungarian.txt
+++ b/src/lang/hungarian.txt
diff --git a/lang/icelandic.txt b/src/lang/icelandic.txt
index a44f198d6..a44f198d6 100644
--- a/lang/icelandic.txt
+++ b/src/lang/icelandic.txt
diff --git a/lang/italian.txt b/src/lang/italian.txt
index 99a11242b..99a11242b 100644
--- a/lang/italian.txt
+++ b/src/lang/italian.txt
diff --git a/lang/norwegian.txt b/src/lang/norwegian.txt
index 6f24029c6..6f24029c6 100644
--- a/lang/norwegian.txt
+++ b/src/lang/norwegian.txt
diff --git a/lang/origveh.txt b/src/lang/origveh.txt
index cf22c2df6..cf22c2df6 100644
--- a/lang/origveh.txt
+++ b/src/lang/origveh.txt
diff --git a/lang/polish.txt b/src/lang/polish.txt
index c5c919458..c5c919458 100644
--- a/lang/polish.txt
+++ b/src/lang/polish.txt
diff --git a/lang/portuguese.txt b/src/lang/portuguese.txt
index 3d500b654..3d500b654 100644
--- a/lang/portuguese.txt
+++ b/src/lang/portuguese.txt
diff --git a/lang/romanian.txt b/src/lang/romanian.txt
index 9d4326238..9d4326238 100644
--- a/lang/romanian.txt
+++ b/src/lang/romanian.txt
diff --git a/lang/russian.txt b/src/lang/russian.txt
index 1cafa7ada..1cafa7ada 100644
--- a/lang/russian.txt
+++ b/src/lang/russian.txt
diff --git a/lang/slovak.txt b/src/lang/slovak.txt
index d6c30cb2a..d6c30cb2a 100644
--- a/lang/slovak.txt
+++ b/src/lang/slovak.txt
diff --git a/lang/spanish.txt b/src/lang/spanish.txt
index 4792f5e25..4792f5e25 100644
--- a/lang/spanish.txt
+++ b/src/lang/spanish.txt
diff --git a/lang/swedish.txt b/src/lang/swedish.txt
index aa789d533..aa789d533 100644
--- a/lang/swedish.txt
+++ b/src/lang/swedish.txt
diff --git a/lang/turkish.txt b/src/lang/turkish.txt
index bc8b70546..bc8b70546 100644
--- a/lang/turkish.txt
+++ b/src/lang/turkish.txt
diff --git a/lang/ukrainian.txt b/src/lang/ukrainian.txt
index d7c144ffd..d7c144ffd 100644
--- a/lang/ukrainian.txt
+++ b/src/lang/ukrainian.txt
diff --git a/lang/unfinished/afrikaans.txt b/src/lang/unfinished/afrikaans.txt
index eb19dbd18..eb19dbd18 100644
--- a/lang/unfinished/afrikaans.txt
+++ b/src/lang/unfinished/afrikaans.txt
diff --git a/lang/unfinished/croatian.txt b/src/lang/unfinished/croatian.txt
index cbfafb8cb..cbfafb8cb 100644
--- a/lang/unfinished/croatian.txt
+++ b/src/lang/unfinished/croatian.txt
diff --git a/lang/unfinished/frisian.txt b/src/lang/unfinished/frisian.txt
index 3b970a2b8..3b970a2b8 100644
--- a/lang/unfinished/frisian.txt
+++ b/src/lang/unfinished/frisian.txt
diff --git a/lang/unfinished/greek.txt b/src/lang/unfinished/greek.txt
index 9ae7cdff8..9ae7cdff8 100644
--- a/lang/unfinished/greek.txt
+++ b/src/lang/unfinished/greek.txt
diff --git a/lang/unfinished/japanese.txt b/src/lang/unfinished/japanese.txt
index 586ab0e64..586ab0e64 100644
--- a/lang/unfinished/japanese.txt
+++ b/src/lang/unfinished/japanese.txt
diff --git a/lang/unfinished/latvian.txt b/src/lang/unfinished/latvian.txt
index 8b41daf62..8b41daf62 100644
--- a/lang/unfinished/latvian.txt
+++ b/src/lang/unfinished/latvian.txt
diff --git a/lang/unfinished/lithuanian.txt b/src/lang/unfinished/lithuanian.txt
index 583f3d38d..583f3d38d 100644
--- a/lang/unfinished/lithuanian.txt
+++ b/src/lang/unfinished/lithuanian.txt
diff --git a/lang/unfinished/serbian.txt b/src/lang/unfinished/serbian.txt
index 5bc98f923..5bc98f923 100644
--- a/lang/unfinished/serbian.txt
+++ b/src/lang/unfinished/serbian.txt
diff --git a/lang/unfinished/simplified_chinese.txt b/src/lang/unfinished/simplified_chinese.txt
index b7e41a1b6..b7e41a1b6 100644
--- a/lang/unfinished/simplified_chinese.txt
+++ b/src/lang/unfinished/simplified_chinese.txt
diff --git a/lang/unfinished/slovenian.txt b/src/lang/unfinished/slovenian.txt
index 71bc1b503..71bc1b503 100644
--- a/lang/unfinished/slovenian.txt
+++ b/src/lang/unfinished/slovenian.txt
diff --git a/lang/unfinished/traditional_chinese.txt b/src/lang/unfinished/traditional_chinese.txt
index 81913d445..81913d445 100644
--- a/lang/unfinished/traditional_chinese.txt
+++ b/src/lang/unfinished/traditional_chinese.txt
diff --git a/livery.h b/src/livery.h
index 2655dcd48..2655dcd48 100644
--- a/livery.h
+++ b/src/livery.h
diff --git a/lzoconf.h b/src/lzoconf.h
index fa50113f4..fa50113f4 100644
--- a/lzoconf.h
+++ b/src/lzoconf.h
diff --git a/macros.h b/src/macros.h
index 8e310c07e..8e310c07e 100644
--- a/macros.h
+++ b/src/macros.h
diff --git a/main_gui.c b/src/main_gui.c
index e2b816e75..e2b816e75 100644
--- a/main_gui.c
+++ b/src/main_gui.c
diff --git a/map.c b/src/map.c
index df16343c7..df16343c7 100644
--- a/map.c
+++ b/src/map.c
diff --git a/map.h b/src/map.h
index 25e29ef06..25e29ef06 100644
--- a/map.h
+++ b/src/map.h
diff --git a/masm64.rules b/src/masm64.rules
index 8444fa3f6..8444fa3f6 100644
--- a/masm64.rules
+++ b/src/masm64.rules
diff --git a/md5.c b/src/md5.c
index 59728e78a..59728e78a 100644
--- a/md5.c
+++ b/src/md5.c
diff --git a/md5.h b/src/md5.h
index 6e1f3044b..6e1f3044b 100644
--- a/md5.h
+++ b/src/md5.h
diff --git a/mersenne.c b/src/mersenne.c
index bc4cb949a..bc4cb949a 100644
--- a/mersenne.c
+++ b/src/mersenne.c
diff --git a/minilzo.c b/src/minilzo.c
index ab26b0a02..ab26b0a02 100644
--- a/minilzo.c
+++ b/src/minilzo.c
diff --git a/minilzo.h b/src/minilzo.h
index cf06a4c9c..cf06a4c9c 100644
--- a/minilzo.h
+++ b/src/minilzo.h
diff --git a/misc.c b/src/misc.c
index fd3a74b79..fd3a74b79 100644
--- a/misc.c
+++ b/src/misc.c
diff --git a/misc_cmd.c b/src/misc_cmd.c
index 94b675531..94b675531 100644
--- a/misc_cmd.c
+++ b/src/misc_cmd.c
diff --git a/misc_gui.c b/src/misc_gui.c
index 693272c2f..693272c2f 100644
--- a/misc_gui.c
+++ b/src/misc_gui.c
diff --git a/mixer.c b/src/mixer.c
index 5b97afbf9..5b97afbf9 100644
--- a/mixer.c
+++ b/src/mixer.c
diff --git a/mixer.h b/src/mixer.h
index d50dc4739..d50dc4739 100644
--- a/mixer.h
+++ b/src/mixer.h
diff --git a/music.c b/src/music.c
index 202690139..202690139 100644
--- a/music.c
+++ b/src/music.c
diff --git a/music.h b/src/music.h
index a33565224..a33565224 100644
--- a/music.h
+++ b/src/music.h
diff --git a/music/bemidi.cpp b/src/music/bemidi.cpp
index d87fae63b..d87fae63b 100644
--- a/music/bemidi.cpp
+++ b/src/music/bemidi.cpp
diff --git a/music/bemidi.h b/src/music/bemidi.h
index 10ead59ff..10ead59ff 100644
--- a/music/bemidi.h
+++ b/src/music/bemidi.h
diff --git a/music/dmusic.cpp b/src/music/dmusic.cpp
index e20842d2e..e20842d2e 100644
--- a/music/dmusic.cpp
+++ b/src/music/dmusic.cpp
diff --git a/music/dmusic.h b/src/music/dmusic.h
index 5d0990137..5d0990137 100644
--- a/music/dmusic.h
+++ b/src/music/dmusic.h
diff --git a/music/extmidi.c b/src/music/extmidi.c
index 901fa4fd7..901fa4fd7 100644
--- a/music/extmidi.c
+++ b/src/music/extmidi.c
diff --git a/music/extmidi.h b/src/music/extmidi.h
index 681c34bd6..681c34bd6 100644
--- a/music/extmidi.h
+++ b/src/music/extmidi.h
diff --git a/music/null_m.c b/src/music/null_m.c
index c76a60211..c76a60211 100644
--- a/music/null_m.c
+++ b/src/music/null_m.c
diff --git a/music/null_m.h b/src/music/null_m.h
index 0f3e2cfa5..0f3e2cfa5 100644
--- a/music/null_m.h
+++ b/src/music/null_m.h
diff --git a/music/os2_m.c b/src/music/os2_m.c
index 75df60c8d..75df60c8d 100644
--- a/music/os2_m.c
+++ b/src/music/os2_m.c
diff --git a/music/os2_m.h b/src/music/os2_m.h
index 173f096a5..173f096a5 100644
--- a/music/os2_m.h
+++ b/src/music/os2_m.h
diff --git a/music/qtmidi.c b/src/music/qtmidi.c
index 6f0a215d0..6f0a215d0 100644
--- a/music/qtmidi.c
+++ b/src/music/qtmidi.c
diff --git a/music/qtmidi.h b/src/music/qtmidi.h
index 727ce25e1..727ce25e1 100644
--- a/music/qtmidi.h
+++ b/src/music/qtmidi.h
diff --git a/music/win32_m.c b/src/music/win32_m.c
index 36b79b30b..36b79b30b 100644
--- a/music/win32_m.c
+++ b/src/music/win32_m.c
diff --git a/music/win32_m.h b/src/music/win32_m.h
index 83893ed1e..83893ed1e 100644
--- a/music/win32_m.h
+++ b/src/music/win32_m.h
diff --git a/music_gui.c b/src/music_gui.c
index 84a6324c2..84a6324c2 100644
--- a/music_gui.c
+++ b/src/music_gui.c
diff --git a/namegen.c b/src/namegen.c
index c70cc2d35..c70cc2d35 100644
--- a/namegen.c
+++ b/src/namegen.c
diff --git a/namegen.h b/src/namegen.h
index 664a014ec..664a014ec 100644
--- a/namegen.h
+++ b/src/namegen.h
diff --git a/network/core/config.h b/src/network/core/config.h
index 0b80800f0..0b80800f0 100644
--- a/network/core/config.h
+++ b/src/network/core/config.h
diff --git a/network/core/game.h b/src/network/core/game.h
index 71268f7d2..71268f7d2 100644
--- a/network/core/game.h
+++ b/src/network/core/game.h
diff --git a/network/core/os_abstraction.h b/src/network/core/os_abstraction.h
index c7df16a93..c7df16a93 100644
--- a/network/core/os_abstraction.h
+++ b/src/network/core/os_abstraction.h
diff --git a/network/core/packet.c b/src/network/core/packet.c
index 957bd2ad6..957bd2ad6 100644
--- a/network/core/packet.c
+++ b/src/network/core/packet.c
diff --git a/network/core/packet.h b/src/network/core/packet.h
index 2510c69a7..2510c69a7 100644
--- a/network/core/packet.h
+++ b/src/network/core/packet.h
diff --git a/network/core/tcp.c b/src/network/core/tcp.c
index 493a97dff..ec073c7ce 100644
--- a/network/core/tcp.c
+++ b/src/network/core/tcp.c
@@ -6,7 +6,7 @@
 #include "../../debug.h"
 #include "../../openttd.h"
 #include "../../variables.h"
-#include "../../table/strings.h"
+#include "table/strings.h"
 #include "../../functions.h"
 
 #include "os_abstraction.h"
diff --git a/network/core/tcp.h b/src/network/core/tcp.h
index e3c307353..e3c307353 100644
--- a/network/core/tcp.h
+++ b/src/network/core/tcp.h
diff --git a/network/core/udp.c b/src/network/core/udp.c
index badd9a532..badd9a532 100644
--- a/network/core/udp.c
+++ b/src/network/core/udp.c
diff --git a/network/core/udp.h b/src/network/core/udp.h
index 3221e664f..3221e664f 100644
--- a/network/core/udp.h
+++ b/src/network/core/udp.h
diff --git a/network/network.c b/src/network/network.c
index 83f7eedcd..c8cb85804 100644
--- a/network/network.c
+++ b/src/network/network.c
@@ -25,7 +25,7 @@
 #include "../variables.h"
 #include "../date.h"
 #include "../newgrf_config.h"
-#include "../table/strings.h"
+#include "table/strings.h"
 #include "network_client.h"
 #include "network_server.h"
 #include "network_udp.h"
diff --git a/network/network.h b/src/network/network.h
index 779fe393e..779fe393e 100644
--- a/network/network.h
+++ b/src/network/network.h
diff --git a/network/network_client.c b/src/network/network_client.c
index ce2a71ac1..6e27eec56 100644
--- a/network/network_client.c
+++ b/src/network/network_client.c
@@ -9,7 +9,7 @@
 #include "network_data.h"
 #include "core/tcp.h"
 #include "../date.h"
-#include "../table/strings.h"
+#include "table/strings.h"
 #include "../functions.h"
 #include "network_client.h"
 #include "network_gamelist.h"
diff --git a/network/network_client.h b/src/network/network_client.h
index 2dd776ac1..2dd776ac1 100644
--- a/network/network_client.h
+++ b/src/network/network_client.h
diff --git a/network/network_data.c b/src/network/network_data.c
index 9e5e6424d..9e5e6424d 100644
--- a/network/network_data.c
+++ b/src/network/network_data.c
diff --git a/network/network_data.h b/src/network/network_data.h
index 3e42e00cf..3e42e00cf 100644
--- a/network/network_data.h
+++ b/src/network/network_data.h
diff --git a/network/network_gamelist.c b/src/network/network_gamelist.c
index a830073ad..a830073ad 100644
--- a/network/network_gamelist.c
+++ b/src/network/network_gamelist.c
diff --git a/network/network_gamelist.h b/src/network/network_gamelist.h
index c1a1a0904..c1a1a0904 100644
--- a/network/network_gamelist.h
+++ b/src/network/network_gamelist.h
diff --git a/network/network_gui.c b/src/network/network_gui.c
index 91c990bbc..dd865118e 100644
--- a/network/network_gui.c
+++ b/src/network/network_gui.c
@@ -10,7 +10,7 @@
 #include "../date.h"
 
 #include "../fios.h"
-#include "../table/strings.h"
+#include "table/strings.h"
 #include "../functions.h"
 #include "network_data.h"
 #include "network_client.h"
diff --git a/network/network_gui.h b/src/network/network_gui.h
index aa4313eba..aa4313eba 100644
--- a/network/network_gui.h
+++ b/src/network/network_gui.h
diff --git a/network/network_server.c b/src/network/network_server.c
index 2a75d15fe..5a7109105 100644
--- a/network/network_server.c
+++ b/src/network/network_server.c
@@ -11,7 +11,7 @@
 #include "core/tcp.h"
 #include "../train.h"
 #include "../date.h"
-#include "../table/strings.h"
+#include "table/strings.h"
 #include "../functions.h"
 #include "network_server.h"
 #include "network_udp.h"
diff --git a/network/network_server.h b/src/network/network_server.h
index c5b2baade..c5b2baade 100644
--- a/network/network_server.h
+++ b/src/network/network_server.h
diff --git a/network/network_udp.c b/src/network/network_udp.c
index aeef75e77..aeef75e77 100644
--- a/network/network_udp.c
+++ b/src/network/network_udp.c
diff --git a/network/network_udp.h b/src/network/network_udp.h
index 4488d19d4..4488d19d4 100644
--- a/network/network_udp.h
+++ b/src/network/network_udp.h
diff --git a/newgrf.c b/src/newgrf.c
index c2b4e464b..c2b4e464b 100644
--- a/newgrf.c
+++ b/src/newgrf.c
diff --git a/newgrf.h b/src/newgrf.h
index 1d8c5a365..1d8c5a365 100644
--- a/newgrf.h
+++ b/src/newgrf.h
diff --git a/newgrf_callbacks.h b/src/newgrf_callbacks.h
index 9d0a7a3da..9d0a7a3da 100644
--- a/newgrf_callbacks.h
+++ b/src/newgrf_callbacks.h
diff --git a/newgrf_cargo.c b/src/newgrf_cargo.c
index 386f8c384..386f8c384 100644
--- a/newgrf_cargo.c
+++ b/src/newgrf_cargo.c
diff --git a/newgrf_cargo.h b/src/newgrf_cargo.h
index d3b352e48..d3b352e48 100644
--- a/newgrf_cargo.h
+++ b/src/newgrf_cargo.h
diff --git a/newgrf_config.c b/src/newgrf_config.c
index a6ab2fae5..a6ab2fae5 100644
--- a/newgrf_config.c
+++ b/src/newgrf_config.c
diff --git a/newgrf_config.h b/src/newgrf_config.h
index 6ebc3ffa2..6ebc3ffa2 100644
--- a/newgrf_config.h
+++ b/src/newgrf_config.h
diff --git a/newgrf_engine.c b/src/newgrf_engine.c
index 0662f3fc8..0662f3fc8 100644
--- a/newgrf_engine.c
+++ b/src/newgrf_engine.c
diff --git a/newgrf_engine.h b/src/newgrf_engine.h
index bd9ddb230..bd9ddb230 100644
--- a/newgrf_engine.h
+++ b/src/newgrf_engine.h
diff --git a/newgrf_gui.c b/src/newgrf_gui.c
index 4ae734207..4ae734207 100644
--- a/newgrf_gui.c
+++ b/src/newgrf_gui.c
diff --git a/newgrf_sound.c b/src/newgrf_sound.c
index e96934104..e96934104 100644
--- a/newgrf_sound.c
+++ b/src/newgrf_sound.c
diff --git a/newgrf_sound.h b/src/newgrf_sound.h
index ec2727fb1..ec2727fb1 100644
--- a/newgrf_sound.h
+++ b/src/newgrf_sound.h
diff --git a/newgrf_spritegroup.c b/src/newgrf_spritegroup.c
index f97da9c90..f97da9c90 100644
--- a/newgrf_spritegroup.c
+++ b/src/newgrf_spritegroup.c
diff --git a/newgrf_spritegroup.h b/src/newgrf_spritegroup.h
index f77b6009d..f77b6009d 100644
--- a/newgrf_spritegroup.h
+++ b/src/newgrf_spritegroup.h
diff --git a/newgrf_station.c b/src/newgrf_station.c
index f36769a41..f36769a41 100644
--- a/newgrf_station.c
+++ b/src/newgrf_station.c
diff --git a/newgrf_station.h b/src/newgrf_station.h
index a133fb3d7..a133fb3d7 100644
--- a/newgrf_station.h
+++ b/src/newgrf_station.h
diff --git a/newgrf_text.c b/src/newgrf_text.c
index e859f6e6c..e859f6e6c 100644
--- a/newgrf_text.c
+++ b/src/newgrf_text.c
diff --git a/newgrf_text.h b/src/newgrf_text.h
index b9850a54e..b9850a54e 100644
--- a/newgrf_text.h
+++ b/src/newgrf_text.h
diff --git a/news.h b/src/news.h
index 72f7e842a..72f7e842a 100644
--- a/news.h
+++ b/src/news.h
diff --git a/news_gui.c b/src/news_gui.c
index 7400ac1e4..7400ac1e4 100644
--- a/news_gui.c
+++ b/src/news_gui.c
diff --git a/npf.c b/src/npf.c
index 97b9bf367..97b9bf367 100644
--- a/npf.c
+++ b/src/npf.c
diff --git a/npf.h b/src/npf.h
index 653d31b9a..653d31b9a 100644
--- a/npf.h
+++ b/src/npf.h
diff --git a/oldloader.c b/src/oldloader.c
index f6a56fdd6..f6a56fdd6 100644
--- a/oldloader.c
+++ b/src/oldloader.c
diff --git a/oldpool.c b/src/oldpool.c
index 2b2d188e8..2b2d188e8 100644
--- a/oldpool.c
+++ b/src/oldpool.c
diff --git a/oldpool.h b/src/oldpool.h
index ba22e4ef4..ba22e4ef4 100644
--- a/oldpool.h
+++ b/src/oldpool.h
diff --git a/openttd.c b/src/openttd.c
index 3f15a944e..3f15a944e 100644
--- a/openttd.c
+++ b/src/openttd.c
diff --git a/openttd.h b/src/openttd.h
index 912ae4d8d..912ae4d8d 100644
--- a/openttd.h
+++ b/src/openttd.h
diff --git a/order.h b/src/order.h
index 7031f2455..7031f2455 100644
--- a/order.h
+++ b/src/order.h
diff --git a/order_cmd.c b/src/order_cmd.c
index b510e84ea..b510e84ea 100644
--- a/order_cmd.c
+++ b/src/order_cmd.c
diff --git a/order_gui.c b/src/order_gui.c
index adcaadba0..adcaadba0 100644
--- a/order_gui.c
+++ b/src/order_gui.c
diff --git a/os/macosx/G5_detector.c b/src/os/macosx/G5_detector.c
index b4831c772..b4831c772 100644
--- a/os/macosx/G5_detector.c
+++ b/src/os/macosx/G5_detector.c
diff --git a/os/macosx/macos.h b/src/os/macosx/macos.h
index b8a6cd511..b8a6cd511 100644
--- a/os/macosx/macos.h
+++ b/src/os/macosx/macos.h
diff --git a/os/macosx/macos.m b/src/os/macosx/macos.m
index 59801fce0..59801fce0 100644
--- a/os/macosx/macos.m
+++ b/src/os/macosx/macos.m
diff --git a/os/macosx/osx_stdafx.h b/src/os/macosx/osx_stdafx.h
index 9567d70ba..9567d70ba 100644
--- a/os/macosx/osx_stdafx.h
+++ b/src/os/macosx/osx_stdafx.h
diff --git a/os/macosx/splash.c b/src/os/macosx/splash.c
index 46a19b1a6..46a19b1a6 100644
--- a/os/macosx/splash.c
+++ b/src/os/macosx/splash.c
diff --git a/os/macosx/splash.h b/src/os/macosx/splash.h
index 39880562d..39880562d 100644
--- a/os/macosx/splash.h
+++ b/src/os/macosx/splash.h
diff --git a/os2.c b/src/os2.c
index e01d7c0d2..e01d7c0d2 100644
--- a/os2.c
+++ b/src/os2.c
diff --git a/os_timer.c b/src/os_timer.c
index e2a96e8f9..e2a96e8f9 100644
--- a/os_timer.c
+++ b/src/os_timer.c
diff --git a/ottdres.rc b/src/ottdres.rc
index 383d59af4..383d59af4 100644
--- a/ottdres.rc
+++ b/src/ottdres.rc
diff --git a/pathfind.c b/src/pathfind.c
index 81ccc699c..81ccc699c 100644
--- a/pathfind.c
+++ b/src/pathfind.c
diff --git a/pathfind.h b/src/pathfind.h
index 432d7ea88..432d7ea88 100644
--- a/pathfind.h
+++ b/src/pathfind.h
diff --git a/player.h b/src/player.h
index df959c6e0..df959c6e0 100644
--- a/player.h
+++ b/src/player.h
diff --git a/player_gui.c b/src/player_gui.c
index c4612f5dc..c4612f5dc 100644
--- a/player_gui.c
+++ b/src/player_gui.c
diff --git a/players.c b/src/players.c
index 4c2d1ed37..4c2d1ed37 100644
--- a/players.c
+++ b/src/players.c
diff --git a/queue.c b/src/queue.c
index 9986442bf..9986442bf 100644
--- a/queue.c
+++ b/src/queue.c
diff --git a/queue.h b/src/queue.h
index 1bbdf353c..1bbdf353c 100644
--- a/queue.h
+++ b/src/queue.h
diff --git a/rail.c b/src/rail.c
index c4b20de27..c4b20de27 100644
--- a/rail.c
+++ b/src/rail.c
diff --git a/rail.h b/src/rail.h
index 37270a1bf..37270a1bf 100644
--- a/rail.h
+++ b/src/rail.h
diff --git a/rail_cmd.c b/src/rail_cmd.c
index a793bb8a5..a793bb8a5 100644
--- a/rail_cmd.c
+++ b/src/rail_cmd.c
diff --git a/rail_gui.c b/src/rail_gui.c
index 0a63a41f3..0a63a41f3 100644
--- a/rail_gui.c
+++ b/src/rail_gui.c
diff --git a/rail_map.h b/src/rail_map.h
index 902d4e6a4..902d4e6a4 100644
--- a/rail_map.h
+++ b/src/rail_map.h
diff --git a/railtypes.h b/src/railtypes.h
index e21c1250d..e21c1250d 100644
--- a/railtypes.h
+++ b/src/railtypes.h
diff --git a/resource.h b/src/resource.h
index 41ff821b5..41ff821b5 100644
--- a/resource.h
+++ b/src/resource.h
diff --git a/road.h b/src/road.h
index 3418ef8cd..3418ef8cd 100644
--- a/road.h
+++ b/src/road.h
diff --git a/road_cmd.c b/src/road_cmd.c
index 9f3bc3f6a..9f3bc3f6a 100644
--- a/road_cmd.c
+++ b/src/road_cmd.c
diff --git a/road_cmd.h b/src/road_cmd.h
index 436ecd900..436ecd900 100644
--- a/road_cmd.h
+++ b/src/road_cmd.h
diff --git a/road_gui.c b/src/road_gui.c
index 8507de65f..8507de65f 100644
--- a/road_gui.c
+++ b/src/road_gui.c
diff --git a/road_map.c b/src/road_map.c
index cccd2e76a..cccd2e76a 100644
--- a/road_map.c
+++ b/src/road_map.c
diff --git a/road_map.h b/src/road_map.h
index 258c41e3b..258c41e3b 100644
--- a/road_map.h
+++ b/src/road_map.h
diff --git a/roadveh.h b/src/roadveh.h
index e0c497b46..e0c497b46 100644
--- a/roadveh.h
+++ b/src/roadveh.h
diff --git a/roadveh_cmd.c b/src/roadveh_cmd.c
index 48f6ad180..48f6ad180 100644
--- a/roadveh_cmd.c
+++ b/src/roadveh_cmd.c
diff --git a/roadveh_gui.c b/src/roadveh_gui.c
index ba382b04a..ba382b04a 100644
--- a/roadveh_gui.c
+++ b/src/roadveh_gui.c
diff --git a/saveload.c b/src/saveload.c
index 75396aeee..75396aeee 100644
--- a/saveload.c
+++ b/src/saveload.c
diff --git a/saveload.h b/src/saveload.h
index 5d490b35a..5d490b35a 100644
--- a/saveload.h
+++ b/src/saveload.h
diff --git a/screenshot.c b/src/screenshot.c
index 5a73fa52a..5a73fa52a 100644
--- a/screenshot.c
+++ b/src/screenshot.c
diff --git a/screenshot.h b/src/screenshot.h
index b8cc7df89..b8cc7df89 100644
--- a/screenshot.h
+++ b/src/screenshot.h
diff --git a/sdl.c b/src/sdl.c
index f6474b6e1..f6474b6e1 100644
--- a/sdl.c
+++ b/src/sdl.c
diff --git a/sdl.h b/src/sdl.h
index 9fe374095..9fe374095 100644
--- a/sdl.h
+++ b/src/sdl.h
diff --git a/settings.c b/src/settings.c
index b6d7fa895..b6d7fa895 100644
--- a/settings.c
+++ b/src/settings.c
diff --git a/settings.h b/src/settings.h
index 0ab3ecef3..0ab3ecef3 100644
--- a/settings.h
+++ b/src/settings.h
diff --git a/settings_gui.c b/src/settings_gui.c
index f6806f424..f6806f424 100644
--- a/settings_gui.c
+++ b/src/settings_gui.c
diff --git a/ship.h b/src/ship.h
index 4f91276ef..4f91276ef 100644
--- a/ship.h
+++ b/src/ship.h
diff --git a/ship_cmd.c b/src/ship_cmd.c
index f72323915..f72323915 100644
--- a/ship_cmd.c
+++ b/src/ship_cmd.c
diff --git a/ship_gui.c b/src/ship_gui.c
index 010ea71e5..010ea71e5 100644
--- a/ship_gui.c
+++ b/src/ship_gui.c
diff --git a/signs.c b/src/signs.c
index 4b2d48cd1..4b2d48cd1 100644
--- a/signs.c
+++ b/src/signs.c
diff --git a/signs.h b/src/signs.h
index 9c9fd2982..9c9fd2982 100644
--- a/signs.h
+++ b/src/signs.h
diff --git a/slope.h b/src/slope.h
index 0708bc5d5..0708bc5d5 100644
--- a/slope.h
+++ b/src/slope.h
diff --git a/smallmap_gui.c b/src/smallmap_gui.c
index 65e040656..65e040656 100644
--- a/smallmap_gui.c
+++ b/src/smallmap_gui.c
diff --git a/sound.c b/src/sound.c
index 7e78b07dd..7e78b07dd 100644
--- a/sound.c
+++ b/src/sound.c
diff --git a/sound.h b/src/sound.h
index fd5638558..fd5638558 100644
--- a/sound.h
+++ b/src/sound.h
diff --git a/sound/cocoa_s.c b/src/sound/cocoa_s.c
index 3b758ad71..3b758ad71 100644
--- a/sound/cocoa_s.c
+++ b/src/sound/cocoa_s.c
diff --git a/sound/cocoa_s.h b/src/sound/cocoa_s.h
index 7db5f7023..7db5f7023 100644
--- a/sound/cocoa_s.h
+++ b/src/sound/cocoa_s.h
diff --git a/sound/null_s.c b/src/sound/null_s.c
index f68c4b13a..f68c4b13a 100644
--- a/sound/null_s.c
+++ b/src/sound/null_s.c
diff --git a/sound/null_s.h b/src/sound/null_s.h
index 6ccd19aed..6ccd19aed 100644
--- a/sound/null_s.h
+++ b/src/sound/null_s.h
diff --git a/sound/sdl_s.c b/src/sound/sdl_s.c
index 4b1da52d6..4b1da52d6 100644
--- a/sound/sdl_s.c
+++ b/src/sound/sdl_s.c
diff --git a/sound/sdl_s.h b/src/sound/sdl_s.h
index 6fc2b6dc0..6fc2b6dc0 100644
--- a/sound/sdl_s.h
+++ b/src/sound/sdl_s.h
diff --git a/sound/win32_s.c b/src/sound/win32_s.c
index a39cee985..a39cee985 100644
--- a/sound/win32_s.c
+++ b/src/sound/win32_s.c
diff --git a/sound/win32_s.h b/src/sound/win32_s.h
index 65c6a957d..65c6a957d 100644
--- a/sound/win32_s.h
+++ b/src/sound/win32_s.h
diff --git a/sprite.h b/src/sprite.h
index 9dca01a66..9dca01a66 100644
--- a/sprite.h
+++ b/src/sprite.h
diff --git a/spritecache.c b/src/spritecache.c
index e8c031fad..e8c031fad 100644
--- a/spritecache.c
+++ b/src/spritecache.c
diff --git a/spritecache.h b/src/spritecache.h
index 3a5676a63..3a5676a63 100644
--- a/spritecache.h
+++ b/src/spritecache.h
diff --git a/station.h b/src/station.h
index aaa168384..aaa168384 100644
--- a/station.h
+++ b/src/station.h
diff --git a/station_cmd.c b/src/station_cmd.c
index 73d6d1bac..73d6d1bac 100644
--- a/station_cmd.c
+++ b/src/station_cmd.c
diff --git a/station_gui.c b/src/station_gui.c
index 55428a793..55428a793 100644
--- a/station_gui.c
+++ b/src/station_gui.c
diff --git a/station_map.c b/src/station_map.c
index 6341cd6ba..6341cd6ba 100644
--- a/station_map.c
+++ b/src/station_map.c
diff --git a/station_map.h b/src/station_map.h
index c52769b14..c52769b14 100644
--- a/station_map.h
+++ b/src/station_map.h
diff --git a/stdafx.h b/src/stdafx.h
index 8504e585c..8504e585c 100644
--- a/stdafx.h
+++ b/src/stdafx.h
diff --git a/strgen/strgen.c b/src/strgen/strgen.c
index 1726750f5..1726750f5 100644
--- a/strgen/strgen.c
+++ b/src/strgen/strgen.c
diff --git a/string.c b/src/string.c
index dba2c7131..dba2c7131 100644
--- a/string.c
+++ b/src/string.c
diff --git a/string.h b/src/string.h
index 2dbc06eee..2dbc06eee 100644
--- a/string.h
+++ b/src/string.h
diff --git a/strings.c b/src/strings.c
index d94674193..d94674193 100644
--- a/strings.c
+++ b/src/strings.c
diff --git a/strings.h b/src/strings.h
index dd4fd179d..dd4fd179d 100644
--- a/strings.h
+++ b/src/strings.h
diff --git a/subsidy_gui.c b/src/subsidy_gui.c
index a1b40ad90..a1b40ad90 100644
--- a/subsidy_gui.c
+++ b/src/subsidy_gui.c
diff --git a/table/ai_rail.h b/src/table/ai_rail.h
index 8e6a49c50..8e6a49c50 100644
--- a/table/ai_rail.h
+++ b/src/table/ai_rail.h
diff --git a/table/animcursors.h b/src/table/animcursors.h
index 856527f93..856527f93 100644
--- a/table/animcursors.h
+++ b/src/table/animcursors.h
diff --git a/table/autorail.h b/src/table/autorail.h
index d94747ec1..d94747ec1 100644
--- a/table/autorail.h
+++ b/src/table/autorail.h
diff --git a/table/bridge_land.h b/src/table/bridge_land.h
index 8589c6e20..8589c6e20 100644
--- a/table/bridge_land.h
+++ b/src/table/bridge_land.h
diff --git a/table/build_industry.h b/src/table/build_industry.h
index c05cbe32d..c05cbe32d 100644
--- a/table/build_industry.h
+++ b/src/table/build_industry.h
diff --git a/table/clear_land.h b/src/table/clear_land.h
index 581c86855..581c86855 100644
--- a/table/clear_land.h
+++ b/src/table/clear_land.h
diff --git a/table/control_codes.h b/src/table/control_codes.h
index a1ff42a89..a1ff42a89 100644
--- a/table/control_codes.h
+++ b/src/table/control_codes.h
diff --git a/table/elrail_data.h b/src/table/elrail_data.h
index 1ed5751b4..1ed5751b4 100644
--- a/table/elrail_data.h
+++ b/src/table/elrail_data.h
diff --git a/table/engines.h b/src/table/engines.h
index 08c4cea00..08c4cea00 100644
--- a/table/engines.h
+++ b/src/table/engines.h
diff --git a/table/files.h b/src/table/files.h
index 4dfdfebb6..4dfdfebb6 100644
--- a/table/files.h
+++ b/src/table/files.h
diff --git a/table/genland.h b/src/table/genland.h
index 4007f8db3..4007f8db3 100644
--- a/table/genland.h
+++ b/src/table/genland.h
diff --git a/table/industry_land.h b/src/table/industry_land.h
index 60beb74fb..60beb74fb 100644
--- a/table/industry_land.h
+++ b/src/table/industry_land.h
diff --git a/table/landscape_const.h b/src/table/landscape_const.h
index 518a48047..518a48047 100644
--- a/table/landscape_const.h
+++ b/src/table/landscape_const.h
diff --git a/table/landscape_sprite.h b/src/table/landscape_sprite.h
index 88f5f48b1..88f5f48b1 100644
--- a/table/landscape_sprite.h
+++ b/src/table/landscape_sprite.h
diff --git a/table/namegen.h b/src/table/namegen.h
index a5d9974d6..a5d9974d6 100644
--- a/table/namegen.h
+++ b/src/table/namegen.h
diff --git a/table/palettes.h b/src/table/palettes.h
index fc931c7c2..fc931c7c2 100644
--- a/table/palettes.h
+++ b/src/table/palettes.h
diff --git a/table/road_land.h b/src/table/road_land.h
index 52e013bd9..52e013bd9 100644
--- a/table/road_land.h
+++ b/src/table/road_land.h
diff --git a/table/roadveh.h b/src/table/roadveh.h
index fa8f18e1f..fa8f18e1f 100644
--- a/table/roadveh.h
+++ b/src/table/roadveh.h
diff --git a/table/sprites.h b/src/table/sprites.h
index 071c5ddfb..071c5ddfb 100644
--- a/table/sprites.h
+++ b/src/table/sprites.h
diff --git a/table/station_land.h b/src/table/station_land.h
index 1c5864c2a..1c5864c2a 100644
--- a/table/station_land.h
+++ b/src/table/station_land.h
diff --git a/table/town_land.h b/src/table/town_land.h
index 0a634aa44..0a634aa44 100644
--- a/table/town_land.h
+++ b/src/table/town_land.h
diff --git a/table/track_land.h b/src/table/track_land.h
index 78031e840..78031e840 100644
--- a/table/track_land.h
+++ b/src/table/track_land.h
diff --git a/table/train_cmd.h b/src/table/train_cmd.h
index 1bf8e70c8..1bf8e70c8 100644
--- a/table/train_cmd.h
+++ b/src/table/train_cmd.h
diff --git a/table/tree_land.h b/src/table/tree_land.h
index 9d68681d6..9d68681d6 100644
--- a/table/tree_land.h
+++ b/src/table/tree_land.h
diff --git a/table/unicode.h b/src/table/unicode.h
index 2bbd6624c..2bbd6624c 100644
--- a/table/unicode.h
+++ b/src/table/unicode.h
diff --git a/table/unmovable_land.h b/src/table/unmovable_land.h
index 9b9e7d6cd..9b9e7d6cd 100644
--- a/table/unmovable_land.h
+++ b/src/table/unmovable_land.h
diff --git a/table/water_land.h b/src/table/water_land.h
index 96cef5f39..96cef5f39 100644
--- a/table/water_land.h
+++ b/src/table/water_land.h
diff --git a/terraform_gui.c b/src/terraform_gui.c
index f0a48b2e2..f0a48b2e2 100644
--- a/terraform_gui.c
+++ b/src/terraform_gui.c
diff --git a/texteff.c b/src/texteff.c
index c65cb8675..c65cb8675 100644
--- a/texteff.c
+++ b/src/texteff.c
diff --git a/tgp.c b/src/tgp.c
index d7f9722f9..d7f9722f9 100644
--- a/tgp.c
+++ b/src/tgp.c
diff --git a/tgp.h b/src/tgp.h
index 1e51eecbe..1e51eecbe 100644
--- a/tgp.h
+++ b/src/tgp.h
diff --git a/thread.c b/src/thread.c
index ab2cfd21d..ab2cfd21d 100644
--- a/thread.c
+++ b/src/thread.c
diff --git a/thread.h b/src/thread.h
index 900b87849..900b87849 100644
--- a/thread.h
+++ b/src/thread.h
diff --git a/tile.c b/src/tile.c
index ba6900a36..ba6900a36 100644
--- a/tile.c
+++ b/src/tile.c
diff --git a/tile.h b/src/tile.h
index 97123645f..97123645f 100644
--- a/tile.h
+++ b/src/tile.h
diff --git a/town.h b/src/town.h
index d1edca1c8..d1edca1c8 100644
--- a/town.h
+++ b/src/town.h
diff --git a/town_cmd.c b/src/town_cmd.c
index 9c00cf25a..9c00cf25a 100644
--- a/town_cmd.c
+++ b/src/town_cmd.c
diff --git a/town_gui.c b/src/town_gui.c
index f580cd324..f580cd324 100644
--- a/town_gui.c
+++ b/src/town_gui.c
diff --git a/town_map.h b/src/town_map.h
index bc546cd10..bc546cd10 100644
--- a/town_map.h
+++ b/src/town_map.h
diff --git a/train.h b/src/train.h
index aead2f2ca..aead2f2ca 100644
--- a/train.h
+++ b/src/train.h
diff --git a/train_cmd.c b/src/train_cmd.c
index c1c5746bb..c1c5746bb 100644
--- a/train_cmd.c
+++ b/src/train_cmd.c
diff --git a/train_gui.c b/src/train_gui.c
index a99170b68..a99170b68 100644
--- a/train_gui.c
+++ b/src/train_gui.c
diff --git a/tree_cmd.c b/src/tree_cmd.c
index ccdbcfbad..ccdbcfbad 100644
--- a/tree_cmd.c
+++ b/src/tree_cmd.c
diff --git a/tree_map.h b/src/tree_map.h
index 326504659..326504659 100644
--- a/tree_map.h
+++ b/src/tree_map.h
diff --git a/tunnel_map.c b/src/tunnel_map.c
index a4945591d..a4945591d 100644
--- a/tunnel_map.c
+++ b/src/tunnel_map.c
diff --git a/tunnel_map.h b/src/tunnel_map.h
index c9a3a36a3..c9a3a36a3 100644
--- a/tunnel_map.h
+++ b/src/tunnel_map.h
diff --git a/tunnelbridge_cmd.c b/src/tunnelbridge_cmd.c
index 7e38814c4..7e38814c4 100644
--- a/tunnelbridge_cmd.c
+++ b/src/tunnelbridge_cmd.c
diff --git a/unix.c b/src/unix.c
index 267351b00..267351b00 100644
--- a/unix.c
+++ b/src/unix.c
diff --git a/unmovable.h b/src/unmovable.h
index d7483aa6e..d7483aa6e 100644
--- a/unmovable.h
+++ b/src/unmovable.h
diff --git a/unmovable_cmd.c b/src/unmovable_cmd.c
index 5c1666c22..5c1666c22 100644
--- a/unmovable_cmd.c
+++ b/src/unmovable_cmd.c
diff --git a/unmovable_map.h b/src/unmovable_map.h
index d016a7ac1..d016a7ac1 100644
--- a/unmovable_map.h
+++ b/src/unmovable_map.h
diff --git a/variables.h b/src/variables.h
index bbbe0b79b..bbbe0b79b 100644
--- a/variables.h
+++ b/src/variables.h
diff --git a/vehicle.c b/src/vehicle.c
index c2a2175f8..c2a2175f8 100644
--- a/vehicle.c
+++ b/src/vehicle.c
diff --git a/vehicle.h b/src/vehicle.h
index 10ca04903..10ca04903 100644
--- a/vehicle.h
+++ b/src/vehicle.h
diff --git a/vehicle_gui.c b/src/vehicle_gui.c
index 1c3d45b82..1c3d45b82 100644
--- a/vehicle_gui.c
+++ b/src/vehicle_gui.c
diff --git a/vehicle_gui.h b/src/vehicle_gui.h
index 76f6a5bcc..76f6a5bcc 100644
--- a/vehicle_gui.h
+++ b/src/vehicle_gui.h
diff --git a/video/cocoa_keys.h b/src/video/cocoa_keys.h
index 1e69c1425..1e69c1425 100644
--- a/video/cocoa_keys.h
+++ b/src/video/cocoa_keys.h
diff --git a/video/cocoa_v.h b/src/video/cocoa_v.h
index 93d7b2639..93d7b2639 100644
--- a/video/cocoa_v.h
+++ b/src/video/cocoa_v.h
diff --git a/video/cocoa_v.m b/src/video/cocoa_v.m
index f93f86ca4..f93f86ca4 100644
--- a/video/cocoa_v.m
+++ b/src/video/cocoa_v.m
diff --git a/video/dedicated_v.c b/src/video/dedicated_v.c
index caa1c8963..caa1c8963 100644
--- a/video/dedicated_v.c
+++ b/src/video/dedicated_v.c
diff --git a/video/dedicated_v.h b/src/video/dedicated_v.h
index 9ba1223d3..9ba1223d3 100644
--- a/video/dedicated_v.h
+++ b/src/video/dedicated_v.h
diff --git a/video/null_v.c b/src/video/null_v.c
index ecdd3486c..ecdd3486c 100644
--- a/video/null_v.c
+++ b/src/video/null_v.c
diff --git a/video/null_v.h b/src/video/null_v.h
index 56922d9b3..56922d9b3 100644
--- a/video/null_v.h
+++ b/src/video/null_v.h
diff --git a/video/sdl_v.c b/src/video/sdl_v.c
index e88de85a5..e88de85a5 100644
--- a/video/sdl_v.c
+++ b/src/video/sdl_v.c
diff --git a/video/sdl_v.h b/src/video/sdl_v.h
index 07ba50f3c..07ba50f3c 100644
--- a/video/sdl_v.h
+++ b/src/video/sdl_v.h
diff --git a/video/win32_v.c b/src/video/win32_v.c
index 7588653f0..7588653f0 100644
--- a/video/win32_v.c
+++ b/src/video/win32_v.c
diff --git a/video/win32_v.h b/src/video/win32_v.h
index c3b23a61a..c3b23a61a 100644
--- a/video/win32_v.h
+++ b/src/video/win32_v.h
diff --git a/viewport.c b/src/viewport.c
index fa19e7b60..fa19e7b60 100644
--- a/viewport.c
+++ b/src/viewport.c
diff --git a/viewport.h b/src/viewport.h
index b9d1fce7e..b9d1fce7e 100644
--- a/viewport.h
+++ b/src/viewport.h
diff --git a/void_map.h b/src/void_map.h
index 552a8c705..552a8c705 100644
--- a/void_map.h
+++ b/src/void_map.h
diff --git a/water_cmd.c b/src/water_cmd.c
index 041f83e20..041f83e20 100644
--- a/water_cmd.c
+++ b/src/water_cmd.c
diff --git a/water_map.h b/src/water_map.h
index db3308cbf..db3308cbf 100644
--- a/water_map.h
+++ b/src/water_map.h
diff --git a/waypoint.c b/src/waypoint.c
index e0bc48936..e0bc48936 100644
--- a/waypoint.c
+++ b/src/waypoint.c
diff --git a/waypoint.h b/src/waypoint.h
index 75366fb18..75366fb18 100644
--- a/waypoint.h
+++ b/src/waypoint.h
diff --git a/widget.c b/src/widget.c
index 2c77ccd7c..2c77ccd7c 100644
--- a/widget.c
+++ b/src/widget.c
diff --git a/win32.c b/src/win32.c
index a0a3d05b4..a0a3d05b4 100644
--- a/win32.c
+++ b/src/win32.c
diff --git a/win32.h b/src/win32.h
index bd4720789..bd4720789 100644
--- a/win32.h
+++ b/src/win32.h
diff --git a/win64.asm b/src/win64.asm
index 21bfebbde..21bfebbde 100644
--- a/win64.asm
+++ b/src/win64.asm
diff --git a/window.c b/src/window.c
index 1a12c7c6b..1a12c7c6b 100644
--- a/window.c
+++ b/src/window.c
diff --git a/window.h b/src/window.h
index 2e6fd8b94..2e6fd8b94 100644
--- a/window.h
+++ b/src/window.h
diff --git a/yapf/array.hpp b/src/yapf/array.hpp
index e8eff1c8c..e8eff1c8c 100644
--- a/yapf/array.hpp
+++ b/src/yapf/array.hpp
diff --git a/yapf/autocopyptr.hpp b/src/yapf/autocopyptr.hpp
index fb6bfa028..fb6bfa028 100644
--- a/yapf/autocopyptr.hpp
+++ b/src/yapf/autocopyptr.hpp
diff --git a/yapf/binaryheap.hpp b/src/yapf/binaryheap.hpp
index 7b72a25af..7b72a25af 100644
--- a/yapf/binaryheap.hpp
+++ b/src/yapf/binaryheap.hpp
diff --git a/yapf/blob.hpp b/src/yapf/blob.hpp
index 1a20f3ac2..1a20f3ac2 100644
--- a/yapf/blob.hpp
+++ b/src/yapf/blob.hpp
diff --git a/yapf/countedptr.hpp b/src/yapf/countedptr.hpp
index e63e47fb5..e63e47fb5 100644
--- a/yapf/countedptr.hpp
+++ b/src/yapf/countedptr.hpp
diff --git a/yapf/crc32.hpp b/src/yapf/crc32.hpp
index 10e9a7ac4..10e9a7ac4 100644
--- a/yapf/crc32.hpp
+++ b/src/yapf/crc32.hpp
diff --git a/yapf/fixedsizearray.hpp b/src/yapf/fixedsizearray.hpp
index 48b177f3c..48b177f3c 100644
--- a/yapf/fixedsizearray.hpp
+++ b/src/yapf/fixedsizearray.hpp
diff --git a/yapf/follow_track.cpp b/src/yapf/follow_track.cpp
index ad2f0b724..ad2f0b724 100644
--- a/yapf/follow_track.cpp
+++ b/src/yapf/follow_track.cpp
diff --git a/yapf/follow_track.hpp b/src/yapf/follow_track.hpp
index 7864dc5e5..7864dc5e5 100644
--- a/yapf/follow_track.hpp
+++ b/src/yapf/follow_track.hpp
diff --git a/yapf/hashtable.hpp b/src/yapf/hashtable.hpp
index c6b52e50a..c6b52e50a 100644
--- a/yapf/hashtable.hpp
+++ b/src/yapf/hashtable.hpp
diff --git a/yapf/nodelist.hpp b/src/yapf/nodelist.hpp
index f51afbfd4..f51afbfd4 100644
--- a/yapf/nodelist.hpp
+++ b/src/yapf/nodelist.hpp
diff --git a/yapf/track_dir.hpp b/src/yapf/track_dir.hpp
index 0239f853e..0239f853e 100644
--- a/yapf/track_dir.hpp
+++ b/src/yapf/track_dir.hpp
diff --git a/yapf/yapf.h b/src/yapf/yapf.h
index 6b58b4e08..6b58b4e08 100644
--- a/yapf/yapf.h
+++ b/src/yapf/yapf.h
diff --git a/yapf/yapf.hpp b/src/yapf/yapf.hpp
index 208f29c46..208f29c46 100644
--- a/yapf/yapf.hpp
+++ b/src/yapf/yapf.hpp
diff --git a/yapf/yapf_base.hpp b/src/yapf/yapf_base.hpp
index 1d0417987..1d0417987 100644
--- a/yapf/yapf_base.hpp
+++ b/src/yapf/yapf_base.hpp
diff --git a/yapf/yapf_common.cpp b/src/yapf/yapf_common.cpp
index 39d119858..39d119858 100644
--- a/yapf/yapf_common.cpp
+++ b/src/yapf/yapf_common.cpp
diff --git a/yapf/yapf_common.hpp b/src/yapf/yapf_common.hpp
index 869bc820c..869bc820c 100644
--- a/yapf/yapf_common.hpp
+++ b/src/yapf/yapf_common.hpp
diff --git a/yapf/yapf_costbase.hpp b/src/yapf/yapf_costbase.hpp
index df4d9e787..df4d9e787 100644
--- a/yapf/yapf_costbase.hpp
+++ b/src/yapf/yapf_costbase.hpp
diff --git a/yapf/yapf_costcache.hpp b/src/yapf/yapf_costcache.hpp
index c90d37302..c90d37302 100644
--- a/yapf/yapf_costcache.hpp
+++ b/src/yapf/yapf_costcache.hpp
diff --git a/yapf/yapf_costrail.hpp b/src/yapf/yapf_costrail.hpp
index 93062b5c2..93062b5c2 100644
--- a/yapf/yapf_costrail.hpp
+++ b/src/yapf/yapf_costrail.hpp
diff --git a/yapf/yapf_destrail.hpp b/src/yapf/yapf_destrail.hpp
index 9a5bd0536..9a5bd0536 100644
--- a/yapf/yapf_destrail.hpp
+++ b/src/yapf/yapf_destrail.hpp
diff --git a/yapf/yapf_node.hpp b/src/yapf/yapf_node.hpp
index 2fa82a6a6..2fa82a6a6 100644
--- a/yapf/yapf_node.hpp
+++ b/src/yapf/yapf_node.hpp
diff --git a/yapf/yapf_node_rail.hpp b/src/yapf/yapf_node_rail.hpp
index df0186989..df0186989 100644
--- a/yapf/yapf_node_rail.hpp
+++ b/src/yapf/yapf_node_rail.hpp
diff --git a/yapf/yapf_node_road.hpp b/src/yapf/yapf_node_road.hpp
index dc6f1be3a..dc6f1be3a 100644
--- a/yapf/yapf_node_road.hpp
+++ b/src/yapf/yapf_node_road.hpp
diff --git a/yapf/yapf_rail.cpp b/src/yapf/yapf_rail.cpp
index 1461b9402..1461b9402 100644
--- a/yapf/yapf_rail.cpp
+++ b/src/yapf/yapf_rail.cpp
diff --git a/yapf/yapf_road.cpp b/src/yapf/yapf_road.cpp
index 02b306b31..02b306b31 100644
--- a/yapf/yapf_road.cpp
+++ b/src/yapf/yapf_road.cpp
diff --git a/yapf/yapf_settings.h b/src/yapf/yapf_settings.h
index 193714dd1..193714dd1 100644
--- a/yapf/yapf_settings.h
+++ b/src/yapf/yapf_settings.h
diff --git a/yapf/yapf_ship.cpp b/src/yapf/yapf_ship.cpp
index 038bdba43..038bdba43 100644
--- a/yapf/yapf_ship.cpp
+++ b/src/yapf/yapf_ship.cpp