(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.
2025-03-05 22:04:57 +00:00 · 2007-01-02 19:19:48 +00:00 · 2007-01-02 19:19:48 +00:00 · 66bbf336c6
commit 66bbf336c6
parent ccc0a3f4db
448 changed files with 8150 additions and 6127 deletions
--- a/1132
+++ b/1132
--- a/Makefile.in
+++ 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
--- a/Makefile.lang.in
+++ 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
--- a/Makefile.src.in
+++ 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
--- a/bin/data/2ccmap.grf
+++ b/bin/data/2ccmap.grf
--- a/bin/data/airports.grf
+++ b/bin/data/airports.grf
--- a/bin/data/autorail.grf
+++ b/bin/data/autorail.grf
--- a/bin/data/canalsw.grf
+++ b/bin/data/canalsw.grf
--- a/bin/data/dosdummy.grf
+++ b/bin/data/dosdummy.grf
--- a/bin/data/elrailsw.grf
+++ b/bin/data/elrailsw.grf
--- a/bin/data/nsignalsw.grf
+++ b/bin/data/nsignalsw.grf
--- a/bin/data/openttd.grf
+++ b/bin/data/openttd.grf
--- a/bin/data/opntitle.dat
+++ b/bin/data/opntitle.dat
--- a/bin/data/trkfoundw.grf
+++ b/bin/data/trkfoundw.grf
--- a/bin/scenario/README
+++ b/bin/scenario/README
--- a/bin/scripts/autoexec.scr.example
+++ b/bin/scripts/autoexec.scr.example
--- a/bin/scripts/on_client.scr.example
+++ b/bin/scripts/on_client.scr.example
--- a/bin/scripts/on_dedicated.scr.example
+++ b/bin/scripts/on_dedicated.scr.example
--- a/bin/scripts/on_server.scr.example
+++ b/bin/scripts/on_server.scr.example
--- a/bin/scripts/pre_dedicated.scr.example
+++ b/bin/scripts/pre_dedicated.scr.example
--- a/bin/scripts/pre_server.scr.example
+++ b/bin/scripts/pre_server.scr.example
--- a/bin/scripts/readme.txt
+++ b/bin/scripts/readme.txt
--- a/config.lib
+++ b/config.lib
--- a/414
+++ b/414
@ -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"
-			;;
-
-		--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"
+if [ "$1" = "--reconfig" ]
 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="`"
+	if ! [ -f "config.cache" ]
 	then
-		# Someone did --debug, without assigning a value, assume 1
-		PARAM="$PARAM DEBUG=1"
+		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

-# First remove the Makefile.config, else you can have double entries
-rm -f Makefile.config
+set_default
+detect_params $@
+save_params
+check_params
+make_cflags_and_ldflags

-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"
+EXE=""
+if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "OS2" ]
 then
-	echo "RELEASE=$RELEASE" >> Makefile.config
+	EXE=".exe"
 fi

+TTD="openttd$EXE"
+STRGEN="strgen$EXE"
+ENDIAN_CHECK="endian_check$EXE"
+
+if [ -z "$sort" ]
+then
+	PIPE_SORT="sed s/a/a/"
+else
+	PIPE_SORT="$sort"
+fi
+
+if ! [ -f "$LANG_DIR/english.txt" ]
+then
+	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
+
+# 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;
+
+		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; }
+
+		skip += 1;
+
+		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
+	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
--- 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.
--- a/langs.vcproj
+++ b/langs.vcproj
@ -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>
--- a/langs_vs80.vcproj
+++ b/langs_vs80.vcproj
@ -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>
--- a/makefiledir/Makefile.config_writer
+++ b/makefiledir/Makefile.config_writer
@ -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))
--- a/makefiledir/Makefile.libdetection
+++ b/makefiledir/Makefile.libdetection
@ -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
--- a/media/mainicon.ico
+++ b/media/mainicon.ico
--- a/media/openttd.ico
+++ b/media/openttd.ico
--- a/openttd.vcproj
+++ b/openttd.vcproj
--- a/openttd_vs80.vcproj
+++ b/openttd_vs80.vcproj
--- a/os/macosx/Makefile
+++ b/os/macosx/Makefile
@ -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
--- a/os/macosx/Makefile.setup
+++ b/os/macosx/Makefile.setup
@ -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
-
--- a/projects/generate
+++ 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"
--- a/projects/langs.vcproj
+++ 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>
--- a/projects/langs.vcproj.in
+++ 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>
--- a/projects/langs_vs80.vcproj
+++ 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>
--- a/projects/langs_vs80.vcproj.in
+++ 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>
--- a/projects/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
--- a/projects/openttd.tgt
+++ b/projects/openttd.tgt
--- a/projects/openttd.vcproj
+++ b/projects/openttd.vcproj
--- a/projects/openttd.vcproj.in
+++ 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>
--- a/projects/openttd.xcode/default.pbxuser
+++ b/projects/openttd.xcode/default.pbxuser
--- a/projects/openttd.xcode/project.pbxproj
+++ b/projects/openttd.xcode/project.pbxproj
--- a/projects/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
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
--- a/projects/openttd_vs80.vcproj.in
+++ 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>
--- a/projects/openttd_vs80.vcproj.user
+++ 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>
--- a/projects/strgen.tgt
+++ b/projects/strgen.tgt
--- a/projects/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>
--- a/projects/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>
--- 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
--- a/source.list
+++ 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
--- a/src/ai/ai.c
+++ b/src/ai/ai.c
--- a/src/ai/ai.h
+++ b/src/ai/ai.h
--- a/src/ai/default/default.c
+++ b/src/ai/default/default.c
--- a/src/ai/default/default.h
+++ b/src/ai/default/default.h
--- a/src/ai/trolly/build.c
+++ b/src/ai/trolly/build.c
--- a/src/ai/trolly/pathfinder.c
+++ b/src/ai/trolly/pathfinder.c
--- a/src/ai/trolly/shared.c
+++ b/src/ai/trolly/shared.c
--- a/src/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"
--- a/src/ai/trolly/trolly.h
+++ b/src/ai/trolly/trolly.h
--- a/src/aircraft.h
+++ b/src/aircraft.h
--- a/src/aircraft_cmd.c
+++ b/src/aircraft_cmd.c
--- a/src/aircraft_gui.c
+++ b/src/aircraft_gui.c
--- a/src/airport.c
+++ b/src/airport.c
--- a/src/airport.h
+++ b/src/airport.h
--- a/src/airport_gui.c
+++ b/src/airport_gui.c
--- a/src/airport_movement.h
+++ b/src/airport_movement.h
--- a/src/aystar.c
+++ b/src/aystar.c
--- a/src/aystar.h
+++ b/src/aystar.h
--- a/src/bmp.c
+++ b/src/bmp.c
--- a/src/bmp.h
+++ b/src/bmp.h
--- a/src/bridge.h
+++ b/src/bridge.h
--- a/src/bridge_gui.c
+++ b/src/bridge_gui.c
--- a/src/bridge_map.c
+++ b/src/bridge_map.c
--- a/src/bridge_map.h
+++ b/src/bridge_map.h
--- a/src/build_vehicle_gui.c
+++ b/src/build_vehicle_gui.c
--- a/src/callback_table.c
+++ b/src/callback_table.c
--- a/src/callback_table.h
+++ b/src/callback_table.h
--- a/src/clear_cmd.c
+++ b/src/clear_cmd.c
--- a/src/clear_map.h
+++ b/src/clear_map.h
--- a/src/command.c
+++ b/src/command.c
--- a/src/command.h
+++ b/src/command.h
--- a/src/configure
+++ 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
+
--- a/src/console.c
+++ b/src/console.c
--- a/src/console.h
+++ b/src/console.h
--- a/src/console_cmds.c
+++ b/src/console_cmds.c
--- a/src/currency.c
+++ b/src/currency.c
--- a/src/currency.h
+++ b/src/currency.h
--- a/src/date.c
+++ b/src/date.c
--- a/src/date.h
+++ b/src/date.h
--- a/src/debug.c
+++ b/src/debug.c
--- a/src/debug.h
+++ b/src/debug.h
--- a/src/dedicated.c
+++ b/src/dedicated.c
--- a/src/depot.c
+++ b/src/depot.c
--- a/src/depot.h
+++ b/src/depot.h
--- a/src/depot_gui.c
+++ b/src/depot_gui.c
--- a/Show More
+++ b/Show More