Merge branch 'master' into cpp-11

# Conflicts: # config.lib # projects/openttd_vs100.vcxproj # projects/openttd_vs100.vcxproj.filters # projects/openttd_vs80.vcproj # projects/openttd_vs90.vcproj # src/saveload/saveload.cpp
2019-01-06 21:58:36 +00:00
parent 6c546a2145 effb7da5b4
commit 962a9c5430
490 changed files with 13574 additions and 10565 deletions
--- a/.dorpsgek.yml
+++ b/.dorpsgek.yml
@@ -0,0 +1,13 @@
 notifications:
  push:
    irc:
      - openttd
      - openttd.notice
  pull-request:
    irc:
      - openttd
      - openttd.notice
  issue:
    irc:
      - openttd
      - openttd.notice
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -107,7 +107,7 @@ git clone https://github.com/OpenTTD/OpenTTD-git-hooks.git openttd_hooks
 cd openttd
 git remote add upstream https://github.com/OpenTTD/OpenTTD.git
 cd .git/hooks
-ln -s -t . ../../../openttd_hooks/hooks/*
+ln -s ../../../openttd_hooks/hooks/* .
 ```
 2. If you cloned a while ago, get the latest changes from upstream:
@@ -149,6 +149,16 @@ git push
 **IMPORTANT**: By submitting a patch, you agree to the [License](#license).
 ### Privacy Notice
 We would like to make you aware that contributing to OpenTTD via git will permanently store the name and email address you provide as well as the actual changes and the time and date you made it inside git's version history.
 This is inevitable, because it is a main feature of git. If you are concerned about your privacy, we strongly recommend to use "Anonymous &lt;anonymous@openttd.org&gt;" as the git commit author. We might refuse anonymous contributions if malicious intent is suspected.
 Please note that the contributor identity, once given, is used for copyright verification and to provide proof should a malicious commit be made. As such, the [EU GDPR](https://www.eugdpr.org/key-changes.html) "right to be forgotten" does not apply, as this is an overriding legitimate interest.
 Please also note that your commit is public and as such will potentially be processed by many third-parties. Git's distributed nature makes it impossible to track where exactly your commit, and thus your personal data, will be stored and be processed. If you would not like to accept this risk, please do either commit anonymously or refrain from contributing to the OpenTTD project.
 ### Pull request validation
 Continuous integration (CI) tools monitor pull requests, and help us identify build and code quality issues.
@@ -168,3 +178,4 @@ By contributing your code, you agree to license your contribution under the [GPL
 ### Attribution of this Contributing Guide
 This contributing guide is adapted from [Bootstrap](https://github.com/twbs/bootstrap/blob/master/CONTRIBUTING.md) under the [Creative Commons Attribution 3.0 Unported License](https://github.com/twbs/bootstrap/blob/master/docs/LICENSE) terms for Bootstrap documentation.
 The GDPR notice is adapted from [rsyslog](https://github.com/rsyslog/rsyslog/blob/master/CONTRIBUTING.md) under the [GNU General Public License](https://github.com/rsyslog/rsyslog/blob/master/COPYING).
--- a/173
+++ b/173
@@ -8,9 +8,14 @@
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
 DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = OpenTTD
 PROJECT_NUMBER         =
 PROJECT_BRIEF          =
 PROJECT_LOGO           =
 OUTPUT_DIRECTORY       = docs/source/
-CREATE_SUBDIRS         = NO
+CREATE_SUBDIRS         = YES
 ALLOW_UNICODE_NAMES    = NO
 OUTPUT_LANGUAGE        = English
 BRIEF_MEMBER_DESC      = YES
 REPEAT_BRIEF           = YES
@@ -32,22 +37,42 @@ STRIP_FROM_PATH        = ./
 STRIP_FROM_INC_PATH    =
 SHORT_NAMES            = NO
 JAVADOC_AUTOBRIEF      = YES
 QT_AUTOBRIEF           = NO
 MULTILINE_CPP_IS_BRIEF = NO
 INHERIT_DOCS           = YES
-DISTRIBUTE_GROUP_DOC   = NO
+SEPARATE_MEMBER_PAGES  = NO
 TAB_SIZE               = 2
 ALIASES                =
 TCL_SUBST              =
 OPTIMIZE_OUTPUT_FOR_C  = YES
 OPTIMIZE_OUTPUT_JAVA   = NO
 OPTIMIZE_FOR_FORTRAN   = NO
 OPTIMIZE_OUTPUT_VHDL   = NO
 EXTENSION_MAPPING      =
 MARKDOWN_SUPPORT       = YES
 TOC_INCLUDE_HEADINGS   = 0
 AUTOLINK_SUPPORT       = YES
 BUILTIN_STL_SUPPORT    = NO
 CPP_CLI_SUPPORT        = NO
 SIP_SUPPORT            = NO
 IDL_PROPERTY_SUPPORT   = YES
 DISTRIBUTE_GROUP_DOC   = NO
 GROUP_NESTED_COMPOUNDS = NO
 SUBGROUPING            = YES
 INLINE_GROUPED_CLASSES = NO
 INLINE_SIMPLE_STRUCTS  = NO
 TYPEDEF_HIDES_STRUCT   = NO
 LOOKUP_CACHE_SIZE      = 0
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
 EXTRACT_ALL            = NO
 EXTRACT_PRIVATE        = YES
 EXTRACT_PACKAGE        = NO
 EXTRACT_STATIC         = YES
 EXTRACT_LOCAL_CLASSES  = YES
 EXTRACT_LOCAL_METHODS  = YES
 EXTRACT_ANON_NSPACES   = YES
 HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -55,11 +80,17 @@ HIDE_IN_BODY_DOCS      = NO
 INTERNAL_DOCS          = NO
 CASE_SENSE_NAMES       = YES
 HIDE_SCOPE_NAMES       = NO
 HIDE_COMPOUND_REFERENCE= NO
 SHOW_INCLUDE_FILES     = YES
 SHOW_GROUPED_MEMB_INC  = NO
 FORCE_LOCAL_INCLUDES   = NO
 INLINE_INFO            = YES
 SORT_MEMBER_DOCS       = YES
 SORT_BRIEF_DOCS        = NO
 SORT_MEMBERS_CTORS_1ST = NO
 SORT_GROUP_NAMES       = NO
 SORT_BY_SCOPE_NAME     = NO
 STRICT_PROTO_MATCHING  = NO
 GENERATE_TODOLIST      = YES
 GENERATE_TESTLIST      = YES
 GENERATE_BUGLIST       = YES
@@ -67,22 +98,27 @@ GENERATE_DEPRECATEDLIST= YES
 ENABLED_SECTIONS       =
 MAX_INITIALIZER_LINES  = 30
 SHOW_USED_FILES        = YES
-SHOW_DIRECTORIES       = YES
+SHOW_FILES             = YES
 SHOW_NAMESPACES        = YES
 FILE_VERSION_FILTER    =
 LAYOUT_FILE            =
 CITE_BIB_FILES         =
 #---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
+# Configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
 QUIET                  = NO
 WARNINGS               = YES
 WARN_IF_UNDOCUMENTED   = YES
 WARN_IF_DOC_ERROR      = YES
 WARN_NO_PARAMDOC       = NO
 WARN_AS_ERROR          = NO
 WARN_FORMAT            = "$file:$line: $text"
 WARN_LOGFILE           =
 #---------------------------------------------------------------------------
-# configuration options related to the input files
+# Configuration options related to the input files
 #---------------------------------------------------------------------------
 INPUT                  = ./src/
 INPUT_ENCODING         = UTF-8
 FILE_PATTERNS          = *.c \
                         *.cc \
                         *.cxx \
@@ -93,31 +129,38 @@ FILE_PATTERNS          = *.c \
 RECURSIVE              = YES
 EXCLUDE                =
 EXCLUDE_SYMLINKS       = NO
-EXCLUDE_PATTERNS       = */3rdparty */.svn */script/api
+EXCLUDE_PATTERNS       = */3rdparty \
                         */script/api
 EXCLUDE_SYMBOLS        =
 EXAMPLE_PATH           =
 EXAMPLE_PATTERNS       = *
 EXAMPLE_RECURSIVE      = NO
-IMAGE_PATH             =./docs/
+IMAGE_PATH             = ./docs/
 INPUT_FILTER           =
 FILTER_PATTERNS        =
 FILTER_SOURCE_FILES    = NO
 FILTER_SOURCE_PATTERNS =
 USE_MDFILE_AS_MAINPAGE =
 #---------------------------------------------------------------------------
-# configuration options related to source browsing
+# Configuration options related to source browsing
 #---------------------------------------------------------------------------
 SOURCE_BROWSER         = YES
 INLINE_SOURCES         = NO
 STRIP_CODE_COMMENTS    = YES
 REFERENCED_BY_RELATION = YES
 REFERENCES_RELATION    = YES
 REFERENCES_LINK_SOURCE = YES
 SOURCE_TOOLTIPS        = YES
 USE_HTAGS              = NO
 VERBATIM_HEADERS       = YES
 #---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
+# Configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
 ALPHABETICAL_INDEX     = NO
 COLS_IN_ALPHA_INDEX    = 5
 IGNORE_PREFIX          =
 #---------------------------------------------------------------------------
-# configuration options related to the HTML output
+# Configuration options related to the HTML output
 #---------------------------------------------------------------------------
 GENERATE_HTML          = YES
 HTML_OUTPUT            = html
@@ -125,19 +168,58 @@ HTML_FILE_EXTENSION    = .html
 HTML_HEADER            =
 HTML_FOOTER            =
 HTML_STYLESHEET        =
-HTML_ALIGN_MEMBERS     = YES
+HTML_EXTRA_STYLESHEET  =
-GENERATE_HTMLHELP      = YES
+HTML_EXTRA_FILES       =
 HTML_COLORSTYLE_HUE    = 220
 HTML_COLORSTYLE_SAT    = 100
 HTML_COLORSTYLE_GAMMA  = 80
 HTML_TIMESTAMP         = NO
 HTML_DYNAMIC_MENUS     = YES
 HTML_DYNAMIC_SECTIONS  = NO
 HTML_INDEX_NUM_ENTRIES = 100
 GENERATE_DOCSET        = NO
 DOCSET_FEEDNAME        = "Doxygen generated docs"
 DOCSET_BUNDLE_ID       = org.doxygen.Project
 DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
 DOCSET_PUBLISHER_NAME  = Publisher
 GENERATE_HTMLHELP      = NO
 CHM_FILE               =
 HHC_LOCATION           =
 GENERATE_CHI           = NO
 CHM_INDEX_ENCODING     =
 BINARY_TOC             = NO
 TOC_EXPAND             = YES
 GENERATE_QHP           = NO
 QCH_FILE               =
 QHP_NAMESPACE          = org.doxygen.Project
 QHP_VIRTUAL_FOLDER     = doc
 QHP_CUST_FILTER_NAME   =
 QHP_CUST_FILTER_ATTRS  =
 QHP_SECT_FILTER_ATTRS  =
 QHG_LOCATION           =
 GENERATE_ECLIPSEHELP   = NO
 ECLIPSE_DOC_ID         = org.doxygen.Project
 DISABLE_INDEX          = NO
 ENUM_VALUES_PER_LINE   = 4
 GENERATE_TREEVIEW      = YES
 ENUM_VALUES_PER_LINE   = 4
 TREEVIEW_WIDTH         = 250
 EXT_LINKS_IN_WINDOW    = NO
 FORMULA_FONTSIZE       = 10
 FORMULA_TRANSPARENT    = YES
 USE_MATHJAX            = NO
 MATHJAX_FORMAT         = HTML-CSS
 MATHJAX_RELPATH        = https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/
 MATHJAX_EXTENSIONS     =
 MATHJAX_CODEFILE       =
 SEARCHENGINE           = NO
 SERVER_BASED_SEARCH    = NO
 EXTERNAL_SEARCH        = NO
 SEARCHENGINE_URL       =
 SEARCHDATA_FILE        = searchdata.xml
 EXTERNAL_SEARCH_ID     =
 EXTRA_SEARCH_MAPPINGS  =
 #---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
+# Configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
 GENERATE_LATEX         = NO
 LATEX_OUTPUT           = latex
@@ -147,12 +229,18 @@ COMPACT_LATEX          = NO
 PAPER_TYPE             = a4wide
 EXTRA_PACKAGES         =
 LATEX_HEADER           =
 LATEX_FOOTER           =
 LATEX_EXTRA_STYLESHEET =
 LATEX_EXTRA_FILES      =
 PDF_HYPERLINKS         = NO
 USE_PDFLATEX           = NO
 LATEX_BATCHMODE        = NO
 LATEX_HIDE_INDICES     = NO
 LATEX_SOURCE_CODE      = NO
 LATEX_BIB_STYLE        = plain
 LATEX_TIMESTAMP        = NO
 #---------------------------------------------------------------------------
-# configuration options related to the RTF output
+# Configuration options related to the RTF output
 #---------------------------------------------------------------------------
 GENERATE_RTF           = NO
 RTF_OUTPUT             = rtf
@@ -160,27 +248,33 @@ COMPACT_RTF            = NO
 RTF_HYPERLINKS         = NO
 RTF_STYLESHEET_FILE    =
 RTF_EXTENSIONS_FILE    =
 RTF_SOURCE_CODE        = NO
 #---------------------------------------------------------------------------
-# configuration options related to the man page output
+# Configuration options related to the man page output
 #---------------------------------------------------------------------------
 GENERATE_MAN           = NO
 MAN_OUTPUT             = man
 MAN_EXTENSION          = .3
 MAN_SUBDIR             =
 MAN_LINKS              = NO
 #---------------------------------------------------------------------------
-# configuration options related to the XML output
+# Configuration options related to the XML output
 #---------------------------------------------------------------------------
 GENERATE_XML           = NO
 XML_OUTPUT             = xml
 XML_SCHEMA             =
 XML_DTD                =
 XML_PROGRAMLISTING     = YES
 #---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
+# Configuration options related to the DOCBOOK output
 #---------------------------------------------------------------------------
 GENERATE_DOCBOOK       = NO
 DOCBOOK_OUTPUT         = docbook
 DOCBOOK_PROGRAMLISTING = NO
 #---------------------------------------------------------------------------
 # Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
 GENERATE_AUTOGEN_DEF   = NO
 #---------------------------------------------------------------------------
-# configuration options related to the Perl module output
+# Configuration options related to the Perl module output
 #---------------------------------------------------------------------------
 GENERATE_PERLMOD       = NO
 PERLMOD_LATEX          = NO
@@ -195,42 +289,67 @@ EXPAND_ONLY_PREDEF     = YES
 SEARCH_INCLUDES        = YES
 INCLUDE_PATH           =
 INCLUDE_FILE_PATTERNS  =
-PREDEFINED             = ENABLE_NETWORK WITH_ZLIB WITH_LZO WITH_LZMA WITH_SDL WITH_PNG WITH_FONTCONFIG WITH_FREETYPE WITH_ICU_SORT WITH_ICU_LAYOUT UNICODE _UNICODE _GNU_SOURCE FINAL=
+PREDEFINED             = ENABLE_NETWORK \
                         WITH_ZLIB \
                         WITH_LZO \
                         WITH_LZMA \
                         WITH_SDL \
                         WITH_PNG \
                         WITH_FONTCONFIG \
                         WITH_FREETYPE \
                         WITH_ICU_SORT \
                         WITH_ICU_LAYOUT \
                         UNICODE \
                         _UNICODE \
                         _GNU_SOURCE \
                         FINAL=
 EXPAND_AS_DEFINED      =
 SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------
-# Configuration::additions related to external references
+# Configuration options related to external references
 #---------------------------------------------------------------------------
 TAGFILES               =
 GENERATE_TAGFILE       = objs/openttd.tag
 ALLEXTERNALS           = NO
 EXTERNAL_GROUPS        = YES
 EXTERNAL_PAGES         = YES
 PERL_PATH              = /usr/bin/perl
 #---------------------------------------------------------------------------
 # Configuration options related to the dot tool
 #---------------------------------------------------------------------------
 CLASS_DIAGRAMS         = YES
 MSCGEN_PATH            =
 DIA_PATH               =
 HIDE_UNDOC_RELATIONS   = YES
 HAVE_DOT               = NO
 DOT_NUM_THREADS        = 0
 DOT_FONTNAME           = Helvetica
 DOT_FONTSIZE           = 10
 DOT_FONTPATH           =
 CLASS_GRAPH            = YES
 COLLABORATION_GRAPH    = YES
 GROUP_GRAPHS           = YES
 UML_LOOK               = NO
 UML_LIMIT_NUM_FIELDS   = 10
 TEMPLATE_RELATIONS     = NO
 INCLUDE_GRAPH          = YES
 INCLUDED_BY_GRAPH      = YES
 CALL_GRAPH             = NO
 CALLER_GRAPH           = NO
 GRAPHICAL_HIERARCHY    = YES
 DIRECTORY_GRAPH        = YES
 DOT_IMAGE_FORMAT       = png
 INTERACTIVE_SVG        = NO
 DOT_PATH               =
 DOTFILE_DIRS           =
 MSCFILE_DIRS           =
 DIAFILE_DIRS           =
 PLANTUML_JAR_PATH      =
 PLANTUML_CFG_FILE      =
 PLANTUML_INCLUDE_PATH  =
 DOT_GRAPH_MAX_NODES    = 50
 MAX_DOT_GRAPH_DEPTH    = 1000
 DOT_TRANSPARENT        = NO
 DOT_MULTI_TARGETS      = NO
 GENERATE_LEGEND        = YES
 DOT_CLEANUP            = YES
 #---------------------------------------------------------------------------
 # Configuration::additions related to the search engine
 #---------------------------------------------------------------------------
 SEARCHENGINE           = NO
--- a/75
+++ b/75
@@ -1,75 +0,0 @@
 #!/usr/bin/env groovy
 // The stages we run one by one
 // Please don't add more than 2 items in a single stage; this hurts performance
 def ci_stages = [
    "Checkers": [
        "commit-checker": "openttd/compile-farm-ci:commit-checker",
    ],
    "Compilers": [
        "linux-amd64-gcc-6": "openttd/compile-farm-ci:linux-amd64-gcc-6",
        "linux-amd64-clang-3.8": "openttd/compile-farm-ci:linux-amd64-clang-3.8",
    ],
    "Archs": [
        "linux-i386-gcc-6": "openttd/compile-farm-ci:linux-i386-gcc-6",
    ],
    "OS": [
        "osx-10.9": "openttd/compile-farm-ci:osx-10.9",
    ],
 ]
 def generateStage(targets) {
    return targets.collectEntries{ key, target ->
        ["${key}": generateCI(key, target)]
    }
 }
 def generateCI(display_name, image_name) {
    return {
        githubNotify context: 'openttd/' + display_name, description: 'This commit is being built', status: 'PENDING'
        try {
            dir("${display_name}") {
                unstash "source"
                docker.image("${image_name}").pull()
                docker.image("${image_name}").withRun("--volumes-from ${hostname} --workdir " + pwd()) { c ->
                    sh "docker logs --follow ${c.id}; exit `docker wait ${c.id}`"
                }
            }
            githubNotify context: 'openttd/' + display_name, description: 'The commit looks good', status: 'SUCCESS'
        }
        catch (error) {
            githubNotify context: 'openttd/' + display_name, description: 'The commit cannot be built', status: 'FAILURE'
            throw error
        }
    }
 }
 node {
    ansiColor('xterm') {
        stage("Checkout") {
            checkout scm
            // Ensure user.email and user.name is set, otherwise rebase cannot work
            sh "git config user.email 'info@openttd.org'"
            sh "git config user.name 'OpenTTD CI'"
            // Ensure we also have origin/master available
            sh "git fetch --no-tags origin master:refs/remotes/origin/master"
            // Try to rebase to origin/master; if this fails, fail the CI
            sh "git rebase origin/master"
            stash name: "source", useDefaultExcludes: false
        }
        ci_stages.each { ci_stage ->
            stage(ci_stage.key) {
                parallel generateStage(ci_stage.value)
            }
        }
    }
 }
--- a/Makefile.lang.in
+++ b/Makefile.lang.in
@@ -6,7 +6,6 @@
 # See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
 STRGEN        = !!STRGEN!!
 ENDIAN_CHECK  = !!ENDIAN_CHECK!!
 SRC_DIR       = !!SRC_DIR!!
 LANG_DIR      = !!LANG_DIR!!
 BIN_DIR       = !!BIN_DIR!!
@@ -25,11 +24,6 @@ ifeq ($(LANG_SUPPRESS), yes)
 LANG_ERRORS = >/dev/null 2>&1
 endif
 # Make sure endian_host.h is reachable 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 =
@@ -43,19 +37,19 @@ RES := $(shell mkdir -p $(BIN_DIR)/lang )
 all: table/strings.h $(LANGS)
-strgen_base.o: $(SRC_DIR)/strgen/strgen_base.cpp $(SRC_DIR)/strgen/strgen.h endian_host.h $(SRC_DIR)/table/control_codes.h $(SRC_DIR)/table/strgen_tables.h $(SRC_DIR)/safeguards.h
+strgen_base.o: $(SRC_DIR)/strgen/strgen_base.cpp $(SRC_DIR)/strgen/strgen.h $(SRC_DIR)/table/control_codes.h $(SRC_DIR)/table/strgen_tables.h $(SRC_DIR)/safeguards.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
 	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSTRGEN -c -o $@ $<
-strgen.o: $(SRC_DIR)/strgen/strgen.cpp $(SRC_DIR)/strgen/strgen.h endian_host.h $(SRC_DIR)/table/control_codes.h $(SRC_DIR)/table/strgen_tables.h $(SRC_DIR)/safeguards.h
+strgen.o: $(SRC_DIR)/strgen/strgen.cpp $(SRC_DIR)/strgen/strgen.h $(SRC_DIR)/table/control_codes.h $(SRC_DIR)/table/strgen_tables.h $(SRC_DIR)/safeguards.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
 	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSTRGEN -c -o $@ $<
-string.o: $(SRC_DIR)/string.cpp endian_host.h $(SRC_DIR)/safeguards.h
+string.o: $(SRC_DIR)/string.cpp $(SRC_DIR)/safeguards.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
 	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSTRGEN -c -o $@ $<
-alloc_func.o: $(SRC_DIR)/core/alloc_func.cpp endian_host.h $(SRC_DIR)/safeguards.h
+alloc_func.o: $(SRC_DIR)/core/alloc_func.cpp $(SRC_DIR)/safeguards.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
 	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSTRGEN -c -o $@ $<
@@ -80,21 +74,11 @@ $(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 || true # Do not fail all languages when one fails
 # 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.cpp
 	$(E) '$(STAGE) Compiling and Linking $@'
 	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) $(LDFLAGS_BUILD) $< -o $@
 depend:
 clean:
 	$(E) '$(STAGE) Cleaning up language files'
-	$(Q)rm -f strgen.o string.o alloc_func.o getoptdata.o table/strings.h $(STRGEN) $(LANGS) $(LANGS:%=$(BIN_DIR)/lang/%) lang/english.* $(ENDIAN_TARGETS)
+	$(Q)rm -f strgen_base.o strgen.o string.o alloc_func.o getoptdata.o table/strings.h $(STRGEN) $(LANGS) $(LANGS:%=$(BIN_DIR)/lang/%) lang/english.*
 mrproper: clean
 	$(Q)rm -rf $(BIN_DIR)/lang
--- a/Makefile.setting.in
+++ b/Makefile.setting.in
@@ -6,7 +6,6 @@
 # See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
 SETTINGSGEN      = !!SETTINGSGEN!!
 ENDIAN_CHECK     = !!ENDIAN_CHECK!!
 SRC_DIR          = !!SRC_DIR!!
 CXX_BUILD        = !!CXX_BUILD!!
 CFLAGS_BUILD     = !!CFLAGS_BUILD!!
@@ -15,8 +14,6 @@ LDFLAGS_BUILD    = !!LDFLAGS_BUILD!!
 STAGE            = !!STAGE!!
 SETTING_OBJS_DIR = !!SETTING_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 =
@@ -32,7 +29,7 @@ settingsgen.o: $(SRC_DIR)/settingsgen/settingsgen.cpp $(SRC_DIR)/string_func.h $
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
 	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<
-alloc_func.o: $(SRC_DIR)/core/alloc_func.cpp endian_host.h $(SRC_DIR)/safeguards.h
+alloc_func.o: $(SRC_DIR)/core/alloc_func.cpp $(SRC_DIR)/safeguards.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
 	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<
@@ -40,7 +37,7 @@ getoptdata.o: $(SRC_DIR)/misc/getoptdata.cpp $(SRC_DIR)/misc/getoptdata.h $(SRC_
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/misc/%.cpp=%.cpp)'
 	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<
-string.o: $(SRC_DIR)/string.cpp endian_host.h $(SRC_DIR)/safeguards.h
+string.o: $(SRC_DIR)/string.cpp $(SRC_DIR)/safeguards.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
 	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<
@@ -57,21 +54,11 @@ table/settings.h: $(SETTINGSGEN) $(SRC_DIR)/table/settings.h.preamble $(SRC_DIR)
 	@mkdir -p table
 	$(Q)./$(SETTINGSGEN) -o table/settings.h -b $(SRC_DIR)/table/settings.h.preamble -a $(SRC_DIR)/table/settings.h.postamble $(SRC_DIR)/table/*.ini
 # 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.cpp
 	$(E) '$(STAGE) Compiling and Linking $@'
 	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) $(LDFLAGS_BUILD) $< -o $@
 depend:
 clean:
 	$(E) '$(STAGE) Cleaning up settings files'
-	$(Q)rm -f settingsgen.o alloc_func.o getoptdata.o ini_load.o $(SETTINGSGEN) $(ENDIAN_TARGETS) table/settings.h
+	$(Q)rm -f settingsgen.o alloc_func.o getoptdata.o string.o ini_load.o $(SETTINGSGEN) table/settings.h
 mrproper: clean
--- a/Makefile.src.in
+++ b/Makefile.src.in
@@ -29,9 +29,7 @@ SCRIPT_SRC_DIR = !!SCRIPT_SRC_DIR!!
 MEDIA_DIR      = !!MEDIA_DIR!!
 TTD            = !!TTD!!
 STRGEN         = !!STRGEN!!
 ENDIAN_CHECK   = !!ENDIAN_CHECK!!
 DEPEND         = !!DEPEND!!
 ENDIAN_FORCE   = !!ENDIAN_FORCE!!
 OS             = !!OS!!
 STAGE          = !!STAGE!!
 MAKEDEPEND     = !!MAKEDEPEND!!
@@ -40,7 +38,6 @@ SORT           = !!SORT!!
 AWK            = !!AWK!!
 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!!
@@ -52,19 +49,16 @@ OBJS     := $(OBJS_C) $(OBJS_CPP) $(OBJS_MM) $(OBJS_RC)
 SRCS     := !!SRCS!!
 # All C-files depend on those 3 files
-FILE_DEP := $(CONFIG_CACHE_COMPILER) endian_target.h
+FILE_DEP := $(CONFIG_CACHE_COMPILER)
 # 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) -I $(SETTING_OBJS_DIR)
 CFLAGS_MAKEDEP += -I $(SRC_OBJS_DIR) -I $(LANG_OBJS_DIR) -I $(SETTING_OBJS_DIR)
 ifdef SCRIPT_SRC_DIR
 	CFLAGS_MAKEDEP += -I $(SCRIPT_SRC_DIR)
 endif
 ENDIAN_TARGETS := endian_target.h $(ENDIAN_CHECK)
 # Check if we want to show what we are doing
 ifdef VERBOSE
 	Q =
@@ -108,7 +102,6 @@ endif
 # This helps to recompile if flags change
 RES := $(shell if [ "`cat $(CONFIG_CACHE_COMPILER) 2>/dev/null`" != "$(CFLAGS) $(CXXFLAGS)" ]; then echo "$(CFLAGS) $(CXXFLAGS)" > $(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 )
@@ -121,7 +114,7 @@ DEP_MASK := %.d
 DEPS     := $(OBJS:%.o=%.d)
 # Only include the deps if we are compiling everything
-ifeq ($(filter $(ENDIAN_TARGETS) %.o clean mrproper, $(MAKECMDGOALS)),)
+ifeq ($(filter %.o clean mrproper, $(MAKECMDGOALS)),)
 -include $(DEPS)
 else
 # In case we want to compile a single target, include the .d file for it
@@ -155,7 +148,7 @@ DEP_MASK :=
 DEPS     := Makefile.dep
 # Only include the deps if we are not cleaning
-ifeq ($(filter $(ENDIAN_TARGETS) depend clean mrproper, $(MAKECMDGOALS)),)
+ifeq ($(filter depend clean mrproper, $(MAKECMDGOALS)),)
 -include Makefile.dep
 endif
@@ -264,14 +257,7 @@ endif
 $(TTD): $(OBJS) $(CONFIG_CACHE_LINKER)
 	$(E) '$(STAGE) Linking $@'
 ifeq ($(OS), PSP)
 	# Because of a bug in the PSP GCC tools, linking via CXX results
 	#  in total chaos and more problems then you can handle. So we need
 	#  CC to link OpenTTD for PSP
 	$(Q)+$(CC_HOST) $(LDFLAGS) $(OBJS) $(LIBS) -o $@
 else
 	$(Q)+$(CXX_HOST) $(LDFLAGS) $(OBJS) $(LIBS) -o $@
 endif
 ifdef STRIP
 	$(Q)$(STRIP) $@
 endif
@@ -280,16 +266,6 @@ ifeq ($(OS), DOS)
 	$(Q)$(ROOT_DIR)/os/dos/make_dos_binary_selfcontained.sh $(SRC_OBJS_DIR)/$@
 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.cpp
 	$(E) '$(STAGE) Compiling and Linking $@'
 	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) $(LDFLAGS_BUILD) $< -o $@
 # Revision files
 $(SRC_DIR)/rev.cpp: $(CONFIG_CACHE_VERSION) $(SRC_DIR)/rev.cpp.in
@@ -304,7 +280,7 @@ depend: $(DEPS)
 clean:
 	$(E) '$(STAGE) Cleaning up object files'
-	$(Q)rm -f $(DEPS) $(OBJS) $(TTD) $(DEPEND) $(TTD:%=$(BIN_DIR)/%) $(BIN_DIR)/baseset/openttd.32.bmp $(CONFIG_CACHE_COMPILER) $(CONFIG_CACHE_LINKER) $(CONFIG_CACHE_ENDIAN) $(CONFIG_CACHE_SOURCE) $(ENDIAN_TARGETS)
+	$(Q)rm -f $(DEPS) $(OBJS) $(TTD) $(DEPEND) $(TTD:%=$(BIN_DIR)/%) $(BIN_DIR)/baseset/openttd.32.bmp $(CONFIG_CACHE_COMPILER) $(CONFIG_CACHE_LINKER) $(CONFIG_CACHE_SOURCE)
 mrproper: clean
 	$(Q)rm -f $(SRC_DIR)/rev.cpp $(SRC_DIR)/os/windows/ottdres.rc
--- a/README.md
+++ b/README.md
@@ -14,6 +14,7 @@
    - 4.4) [Files in tar (archives)](#44-files-in-tar-archives)
 - 5.0) [OpenTTD features](#50-openttd-features)
    - 5.1) [Logging of potentially dangerous actions](#51-logging-of-potentially-dangerous-actions)
    - 5.2) [Frame rate and performance metrics](#52-frame-rate-and-performance-metrics)
 - 6.0) [Configuration file](#60-configuration-file)
 - 7.0) [Compiling](#70-compiling)
    - 7.1) [Required/optional libraries](#71-requiredoptional-libraries)
@@ -42,9 +43,10 @@ The easiest way to contact the OpenTTD team is by submitting bug reports or
 posting comments in our forums. You can also chat with us on IRC (#openttd
 on irc.oftc.net).
-The OpenTTD homepage is [http://www.openttd.org/](http://www.openttd.org/).
+The OpenTTD homepage is https://www.openttd.org.
-You can also find the OpenTTD forums at [http://forum.openttd.org/](http://forum.openttd.org/).
+You can also find the OpenTTD forums at
 [https://www.tt-forums.net](https://www.tt-forums.net/viewforum.php?f=55).
 ### 2.1) Reporting bugs
@@ -52,12 +54,12 @@ First of all, check whether the bug is not already known. Do this by looking
 through the file called 'known-bugs.txt' which is distributed with OpenTTD
 like this readme.
-For tracking our bugs we are using Githubs issue tracker. You can find
+For tracking our bugs we are using GitHub's issue tracker. You can find
-the tracker at [https://github.com/OpenTTD/OpenTTD/issues](https://github.com/OpenTTD/OpenTTD/issues). Before actually reporting take a look
+the tracker at https://github.com/OpenTTD/OpenTTD/issues. Before actually
-through the already reported bugs there to see if the bug is already known.
+reporting take a look through the already reported bugs there to see if
-The 'known-bugs.txt' file might be a bit outdated at the moment you are
+the bug is already known. The 'known-bugs.txt' file might be a bit outdated
-reading it as only bugs known before the release are documented there. Also
+at the moment you are reading it as only bugs known before the release
-look through the recently closed bugs.
+are documented there. Also look through the recently closed bugs.
 When you are sure it is not already reported you should:
@@ -80,8 +82,8 @@ following information in your bug report:
 - Bug details, including instructions how to reproduce it
 - Platform (Windows, Linux, FreeBSD, …) and compiler (including version) if
   you compiled OpenTTD yourself.
- The processor architecture of your OS (32 bits Windows, 64 bits Windows,
+- The processor architecture of your OS (32-bit Windows, 64-bit Windows,
-   Linux on an ARM, Mac OS X on a PowerPC, …)
+   Linux on an ARM, Mac OS X on a PowerPC, etc.)
 - Attach a saved game **and** a screenshot if possible
 - If this bug only occurred recently please note the last version without
   the bug and the first version including the bug. That way we can fix it
@@ -154,7 +156,7 @@ platforms are:
 - DOS (Allegro)
 - FreeBSD (SDL)
 - Linux (SDL or Allegro)
- MacOS X (universal) (Cocoa video and sound drivers)
+- macOS (universal) (Cocoa video and sound drivers)
 - MorphOS (SDL)
 - OpenBSD (SDL)
 - OS/2 (SDL)
@@ -210,9 +212,9 @@ when using other versions of the game.
 The free data files, split into OpenGFX for graphics, OpenSFX for sounds and
 OpenMSX for music can be found at:
- [http://www.openttd.org/download-opengfx](http://www.openttd.org/download-opengfx) for OpenGFX
+- https://www.openttd.org/download-opengfx for OpenGFX
- [http://www.openttd.org/download-opensfx](http://www.openttd.org/download-opensfx) for OpenSFX
+- https://www.openttd.org/download-opensfx for OpenSFX
- [http://www.openttd.org/download-openmsx](http://www.openttd.org/download-openmsx) for OpenMSX
+- https://www.openttd.org/download-openmsx for OpenMSX
 Please follow the readme of these packages about the installation procedure.
 The Windows installer can optionally download and install these packages.
@@ -224,7 +226,6 @@ have to copy the data files from the CD-ROM into the baseset/ directory. It
 does not matter whether you copy them from the DOS or Windows version of
 Transport Tycoon Deluxe. The Windows install can optionally copy these files.
 You need to copy the following files:
 - sample.cat
 - trg1r.grf or TRG1.GRF
 - trgcr.grf or TRGC.GRF
@@ -234,11 +235,11 @@ You need to copy the following files:
 #### 4.1.3) Original Transport Tycoon Deluxe music
-If you want the Transport Tycoon Deluxe music, copy the files from the gm/
+If you want the Transport Tycoon Deluxe music, copy the appropriate files from
-folder from the Windows version of Transport Tycoon Deluxe to the baseset
+the original game into the baseset folder.
-folder in your OpenTTD folder (also explained in the following sections).
+- TTD for Windows: All files in the gm/ folder (gm_tt00.gm up to gm_tt21.gm)
-The music from the DOS version as well as the original Transport Tycoon does
+- TTD for DOS: The GM.CAT file
-not work.
+- Transport Tycoon Original: The GM.CAT file, but rename it to GM-TTO.CAT
 #### 4.1.4) AIs
@@ -247,10 +248,9 @@ not possible or you want to use an AI that has not been uploaded to the content
 download system download the tar file and place it in the ai/ directory. If the
 AI needs libraries you will have to download those too and put them in the
 ai/library/ directory. All AIs and AI Libraries that have been uploaded to
-the content download system can be found at http://noai.openttd.org/downloads/
+the content download system can be found at https://noai.openttd.org/downloads.
 The AIs and libraries can be found their in the form of .tar.gz packages.
-OpenTTD can read inside tar files but it does not extract .tar.gz files by
+OpenTTD can read inside tar files but it does not extract .tar.gz files by itself.
 itself.
 To figure out which libraries you need for an AI you have to start the AI and
 wait for an error message to pop up. The error message will tell you
@@ -278,47 +278,50 @@ The main OpenTTD directories can be found in various locations, depending on
 your operating system:
 1. The current working directory (from where you started OpenTTD)
-		For non-Windows operating systems OpenTTD will not scan for files in this
+
-		directory if it is your personal directory, i.e. '~/', or when it is the
+    For non-Windows operating systems OpenTTD will not scan for files in this
-		root directory, i.e. '/'.
+    directory if it is your personal directory, i.e. '~/', or when it is the
    root directory, i.e. '/'.
 2. Your personal directory
    - Windows:
        - `C:\My Documents\OpenTTD` (95, 98, ME)
        - `C:\Documents and Settings\<username>\My Documents\OpenTTD` (2000, XP)
-        - `C:\Users\<username>\Documents\OpenTTD` (Vista, 7)
+        - `C:\Users\<username>\Documents\OpenTTD` (Vista, 7, 8.1, 10)
-    - Mac OSX: `~/Documents/OpenTTD`
+    - macOS: `~/Documents/OpenTTD`
    - Linux: `$XDG_DATA_HOME/openttd` which is usually `~/.local/share/openttd`
-     when built with XDG base directory support, otherwise `~/.openttd`
+       when built with XDG base directory support, otherwise `~/.openttd`
 3. The shared directory
    - Windows:
        - `C:\Documents and Settings\All Users\Shared Documents\OpenTTD` (2000, XP)
-        - `C:\Users\Public\Documents\OpenTTD` (Vista, 7)
+        - `C:\Users\Public\Documents\OpenTTD` (Vista, 7, 8.1, 10)
-    - Mac OSX: `/Library/Application Support/OpenTTD`
+    - macOS: `/Library/Application Support/OpenTTD`
    - Linux: not available
 4. The binary directory (where the OpenTTD executable is)
    - Windows: `C:\Program Files\OpenTTD`
    - Linux: `/usr/games`
 5. The installation directory (Linux only)
    - Linux: `/usr/share/games/openttd`
-6. The application bundle (Mac OSX only)
+6. The application bundle (macOS only)
-		It includes the OpenTTD files (grf+lng) and it will work as long as they
+
-		are not touched
+    It includes the OpenTTD files (grf+lng) and it will work as long as they
    are not touched
 Different types of data or extensions go into different subdirectories of the
 chosen main OpenTTD directory:
-| data type  | directory  | additional info |
+| data type | directory | additional info |
 | --- | --- | --- |
 | Config File | (no subdirectory) | |
 | Screenshots | screenshot | |
-| Base Graphics | baseset| (or a subdirectory thereof) |
+| Base Graphics | baseset | (or a subdirectory thereof) |
-| Sound Sets | baseset| (or a subdirectory thereof) |
+| Sound Sets | baseset | (or a subdirectory thereof) |
-| NewGRFs | newgrf| (or a subdirectory thereof) |
+| NewGRFs | newgrf | (or a subdirectory thereof) |
-| 32bpp Sets | newgrf| (or a subdirectory thereof) |
+| 32bpp Sets | newgrf | (or a subdirectory thereof) |
-| Music Sets | baseset| (or a subdirectory thereof) |
+| Music Sets | baseset | (or a subdirectory thereof) |
-| AIs | ai| (or a subdirectory thereof) |
+| AIs | ai | (or a subdirectory thereof) |
-| AI Libraries | ai/library| (or a subdirectory thereof) |
+| AI Libraries | ai/library | (or a subdirectory thereof) |
-| Game Scripts (GS) | game| (or a subdirectory thereof) |
+| Game Scripts (GS) | game | (or a subdirectory thereof) |
 | GS Libraries | game/library | (or a subdirectory thereof) |
 | Savegames | save | |
 | Automatic Savegames | save/autosave | |
@@ -330,16 +333,16 @@ use and no files should be added to it or its subdirectories manually.
 #### Notes:
 - Linux in the previous list means .deb, but most paths should be similar for
-	others.
+   others.
 - The previous search order is also used for NewGRFs and openttd.cfg.
 - If openttd.cfg is not found, then it will be created using the 2, 4, 1, 3,
-	5 order. When built with XDG base directory support, openttd.cfg will be
+   5 order. When built with XDG base directory support, openttd.cfg will be
-	created in $XDG_CONFIG_HOME/openttd which is usually ~/.config/openttd.
+   created in $XDG_CONFIG_HOME/openttd which is usually ~/.config/openttd.
 - Savegames will be relative to the config file only if there is no save/
-	directory in paths with higher priority than the config file path, but
+   directory in paths with higher priority than the config file path, but
-	autosaves and screenshots will always be relative to the config file.
+   autosaves and screenshots will always be relative to the config file.
-	Unless the configuration file is in $XDG_CONFIG_HOME/openttd, then all
+   Unless the configuration file is in $XDG_CONFIG_HOME/openttd, then all
-	other files will be saved under $XDG_DATA_HOME/openttd.
+   other files will be saved under $XDG_DATA_HOME/openttd.
 #### The preferred setup:
@@ -389,19 +392,18 @@ OpenTTD has a lot of features going beyond the original Transport Tycoon Deluxe
 emulation. Unfortunately, there is currently no comprehensive list of features,
 but there is a basic features list on the web, and some optional features can be
 controlled through the Advanced Settings dialog. We also implement some
-features known from [TTDPatch](http://www.ttdpatch.net/).
+features known from [TTDPatch](https://www.ttdpatch.net).
 Several important non-standard controls:
 - Ctrl modifies many commands and makes them more powerful. For example Ctrl
-  clicking on signals with the build signal tool changes their behaviour, holding
+   clicking on signals with the build signal tool changes their behaviour,
-  Ctrl while the track build tool is activated changes it to the track removal
+   holding Ctrl while the track build tool is activated changes it to the track
-  tool, and so on. See [http://wiki.openttd.org/Hidden_features](http://wiki.openttd.org/Hidden_features)
+   removal tool, and so on. See https://wiki.openttd.org/Hidden_features
-  for a non-comprehensive list or look at the tooltips.
+   for a non-comprehensive list or look at the tooltips.
- Ingame console. More information at
+- Ingame console. More information at https://wiki.openttd.org/Console
  [http://wiki.openttd.org/index.php/Console](http://wiki.openttd.org/index.php/Console)
 - Hovering over a GUI element shows tooltips. This can be changed to right click
-  via the advanced settings.
+   via the advanced settings.
 ### 5.1) Logging of potentially dangerous actions
@@ -422,7 +424,7 @@ Information logged:
 - Changing NewGRF parameters, loading compatible NewGRF
 - Changing game mode (scenario editor <-> normal game)
 - Loading game saved in a different OpenTTD / TTDPatch / Transport Tycoon Deluxe /
-  original Transport Tycoon version
+   original Transport Tycoon version
 - Running a modified OpenTTD build
 - Changing settings affecting NewGRF behaviour (non-network-safe settings)
 - Triggering NewGRF bugs
@@ -432,6 +434,70 @@ No personal information is stored.
 You can show the game log by typing 'gamelog' in the console or by running
 OpenTTD in debug mode.
 ### 5.2) Frame rate and performance metrics
 The Help menu in-game has a function to open the Frame rate window. This
 window shows various real-time performance statistics, measuring what parts
 of the game require the most processing power currently.
 A summary of the statistics can also be retrieved from the console with the
 `fps` command. This is especially useful on dedicated servers, where the
 administrator might want to determine what's limiting performance in a slow
 game.
 The frame rate is given as two figures, the simulation rate and the graphics
 frame rate. Usually these are identical, as the screen is rendered exactly
 once per simulated tick, but in the future there might be support for graphics
 and simulation running at different rates. When the game is paused, the
 simulation rate drops to zero.
 In addition to the simulation rate, a game speed factor is also calculated.
 This is based on the target simulation speed, which is 30 milliseconds per
 game tick. At that speed, the expected frame rate is 33.33 frames/second, and
 the game speed factor is how close to that target the actual rate is. When
 the game is in fast forward mode, the game speed factor shows how much
 speed up is achieved.
 The lower part of the window shows timing statistics for individual parts of
 the game. The times shown are short-term and long-term averages of how long
 it takes to process one tick of game time, all figures are in milliseconds.
 Clicking a line in the lower part of the window opens a graph window, giving
 detailed readings on each tick simulated by the game.
 The following is an explanation of the different statistics:
 - *Game loop* - Total processing time used per simulated "tick" in the game.
  This includes all pathfinding, world updates, and economy handling.
 - *Cargo handling* - Time spent loading/unloading cargo at stations, and
  industries and towns sending/retrieving cargo from stations.
 - *Train ticks*, *Road vehicle ticks*, *Ship ticks*, *Aircraft ticks* -
  Time spent on pathfinding and other processing for each player vehicle type.
 - *World ticks* - Time spent on other world/landscape processing. This
  includes towns growing, building animations, updates of farmland and trees,
  and station rating updates.
 - *Link graph delay* - Time overruns of the cargo distribution link graph
  update thread. Usually the link graph is updated in a background thread,
  but these updates need to synchronise with the main game loop occasionally,
  if the time spent on link graph updates is longer than the time taken to
  otherwise simulate the game while it was updating, these delays are counted
  in this figure.
 - *Graphics rendering* - Total time spent rendering all graphics, including
  both GUI and world viewports. This typically spikes when panning the view
  around, and when more things are happening on screen at once.
 - *World viewport rendering* - Isolated time spent rendering just world
  viewports. If this figure is significantly lower than the total graphics
  rendering time, most time is spent rendering GUI than rendering world.
 - *Video output* - Speed of copying the rendered graphics to the display
  adapter. Usually this should be very fast (in the range of 0-3 ms), large
  values for this can indicate a graphics driver problem.
 - *Sound mixing* - Speed of mixing active audio samples together. Usually
  this should be very fast (in the range of 0-3 ms), if it is slow, consider
  switching to the NoSound set.
 If the frame rate window is shaded, the title bar will instead show just the
 current simulation rate and the game speed factor.
 ## 6.0) Configuration file
 The configuration file for OpenTTD (openttd.cfg) is in a simple Windows-like
@@ -445,16 +511,15 @@ create one after closing.
 ### Windows:
-You need Microsoft Visual Studio .NET. Open the project file
+You need Microsoft Visual Studio 2015 Update 3 or more recent. Open the project file
 and it should build automatically. In case you want to build with SDL support
 you need to add WITH_SDL to the project settings.
-PNG (WITH_PNG) and ZLIB (WITH_ZLIB) support is enabled by default. For these
+PNG (WITH_PNG), ZLIB (WITH_ZLIB), LZO (WITH_LZO), Freetype (WITH_FREETYPE) and
-to work you need their development files. For best results, download the
+LZMA (WITH_LZMA) support is enabled by default. For these to work you need their
-openttd-useful.zip file from [http://www.openttd.org/download-openttd-useful](http://www.openttd.org/download-openttd-useful)
+development files. To get them just use vcpkg from https://github.com/Microsoft/vcpkg
-Put the header files into your compiler's include/ directory and the
+using x86-windows-static and x64-windows-static triplets.
-library (.lib) files into the lib/ directory.
+For more help with VS see docs/Readme_Windows_MSVC.md.
 For more help with VS see docs/Readme_Windows_MSVC.txt.
 You can also build it using the Makefile with MSYS/MinGW or Cygwin/MinGW.
 Please read the Makefile for more information.
@@ -468,7 +533,7 @@ Use '`gmake`', but do a '`./configure`' before the first build.
 OpenTTD can be built with GNU '`make`'. On non-GNU systems it is called '`gmake`'.
 However, for the first build one has to do a '`./configure`' first.
-### MacOS X:
+### macOS:
 Use '`make`' or Xcode (which will then call make for you)
 This will give you a binary for your CPU type (PPC/Intel)
@@ -509,19 +574,19 @@ The following libraries are used by OpenTTD for:
 - libSDL/liballegro: hardware access (video, sound, mouse)
 - zlib: (de)compressing of old (0.3.0-1.0.5) savegames, content downloads,
-  heightmaps
+   heightmaps
 - liblzo2: (de)compressing of old (pre 0.3.0) savegames
 - liblzma: (de)compressing of savegames (1.1.0 and later)
 - libpng: making screenshots and loading heightmaps
 - libfreetype: loading generic fonts and rendering them
 - libfontconfig: searching for fonts, resolving font names to actual fonts
 - libicu: handling of right-to-left scripts (e.g. Arabic and Persian) and
-  natural sorting of strings.
+   natural sorting of strings.
 OpenTTD does not require any of the libraries to be present, but without
 liblzma you cannot open most recent savegames and without zlib you cannot
 open most older savegames or use the content downloading system.
-Without libSDL/liballegro on non-Windows and non-MacOS X machines you have
+Without libSDL/liballegro on non-Windows and non-macOS machines you have
 no graphical user interface; you would be building a dedicated server.
 ### 7.2) Supported compilers
@@ -529,25 +594,25 @@ no graphical user interface; you would be building a dedicated server.
 The following compilers are known to compile OpenTTD:
 - Microsoft Visual C++ (MSVC) 2005, 2008 and 2010.
-  Version 2005 gives bogus warnings about scoping issues.
+   Version 2005 gives bogus warnings about scoping issues.
 - GNU Compiler Collection (GCC) 3.3 - 4.4, 4.6 - 4.8.
    - Versions 4.1 and earlier give bogus warnings about uninitialised variables.
    - Versions 4.4, 4.6 give bogus warnings about freeing non-heap objects.
    - Versions 4.6 and later give invalid warnings when lto is enabled.
 - Intel C++ Compiler (ICC) 12.0.
 - Clang/LLVM 2.9 - 3.0
-  Version 2.9 gives bogus warnings about code nonconformity.
+   Version 2.9 gives bogus warnings about code nonconformity.
 The following compilers are known not to compile OpenTTD:
 - Microsoft Visual C++ (MSVC) 2003 and earlier.
 - GNU Compiler Collection (GCC) 3.2 and earlier.
-  These old versions fail due to OpenTTD's template usage.
+   These old versions fail due to OpenTTD's template usage.
 - GNU Compiler Collection (GCC) 4.5. It optimizes enums too aggressively.
-  See http://bugs.openttd.org/task/5513 and references therein.
+   See https://github.com/OpenTTD/OpenTTD/issues/5513 and references therein.
 - Intel C++ Compiler (ICC) 11.1 and earlier.
    - Version 10.0 and earlier fail a configure check and fail with recent
-     system headers.
+       system headers.
    - Version 10.1 fails to compile station_gui.cpp.
    - Version 11.1 fails with an internal error when compiling network.cpp.
 - Clang/LLVM 2.8 and earlier.
@@ -560,7 +625,7 @@ Patches to support more compilers are welcome.
 To recompile the extra graphics needed to play with the original Transport
 Tycoon Deluxe graphics you need GRFCodec (which includes NFORenum) as well.
-GRFCodec can be found at: [http://www.openttd.org/download-grfcodec](http://www.openttd.org/download-grfcodec)
+GRFCodec can be found at https://www.openttd.org/download-grfcodec.
 The compilation of these extra graphics does generally not happen, unless
 you remove the graphics file using '`make maintainer-clean`'.
@@ -573,17 +638,16 @@ modification of the base set files by the build process.
 ## 8.0) Translating
-See [http://www.openttd.org/development](http://www.openttd.org/development) for up-to-date information.
+See https://www.openttd.org/development for up-to-date information.
 The use of the online Translator service, located at
-[http://translator.openttd.org/](http://translator.openttd.org/), is highly
+https://translator.openttd.org, is highly encouraged. For getting an account
-encouraged. For getting an account simply follow the guidelines in the FAQ of
+simply follow the guidelines in the FAQ of the translator website.
 the translator website.
 If for some reason the website is down for a longer period of time, the
 information below might be of help.
-Please contact the translations manager ([http://www.openttd.org/contact](http://www.openttd.org/contact))
+Please contact the translations manager (https://www.openttd.org/contact)
 before beginning the translation process! This avoids double work, as
 someone else may have already started translating to the same language.
@@ -602,8 +666,8 @@ Note: Do not alter the following parts of the file:
 - String identifiers (the first word on each line)
 - Parts of the strings which are in curly braces (such as {STRING})
- Lines beginning with ## (such as ##id), other than the first two lines of
+- Lines beginning with ## (such as ##id), other than the first two lines
-  the file
+   of the file
 ### 8.2) Previewing
@@ -635,7 +699,7 @@ If the game is acting strange and you feel adventurous you can try the
 debugging output. The 'name' variable can help you to display only some type of
 debugging messages. This is mostly undocumented so best is to look in the
 source code file debug.c for the various debugging types. For more information
-look at [http://wiki.openttd.org/index.php/Command_line](http://wiki.openttd.org/index.php/Command_line).
+look at https://wiki.openttd.org/Command_line.
 The most frequent problem is missing data files. Please install OpenGFX and
 possibly OpenSFX and OpenMSX. See section 4.1.1 for more information.
@@ -659,16 +723,16 @@ and add a suitable font for the small, medium and / or large font, e.g.:
 You should use a font name like 'Tahoma' or a path to the desired font.
-Any NewGRF file used in a game is stored inside the savegame and will refuse
+Any NewGRF file used in a game is stored inside the savegame and will refuse to
-to load if you do not have that NewGRF file available. A list of missing files
+load if you do not have that NewGRF file available. A list of missing files can
-can be viewed in the NewGRF window accessible from the file load dialogue window.
+be viewed in the NewGRF window accessible from the file load dialogue window.
 You can try to obtain the missing files from that NewGRF dialogue or – if they
-are not available online – you can search manually through our [forum's graphics
+are not available online – you can search manually through our
-development section](http://www.tt-forums.net/viewforum.php?f=66) or GrfCrawler
+[forum's graphics development section](https://www.tt-forums.net/viewforum.php?f=66)
-(http://grfcrawler.tt-forums.net/). Put the NewGRF files in OpenTTD's newgrf folder
+or [GRFCrawler](https://grfcrawler.tt-forums.net). Put the NewGRF files in
-(see section 4.2 'OpenTTD directories') and rescan the list of available NewGRFs.
+OpenTTD's newgrf folder (see section 4.2 'OpenTTD directories') and rescan the
-Once you have all missing files, you are set to go.
+list of available NewGRFs. Once you have all missing files, you are set to go.
 ## 10.0) Licensing
@@ -697,8 +761,14 @@ os/dos/exe2coff/copying.dj for the exact licensing terms.
 The CWSDPMI implementation in os/dos/cwsdpmi is distributed under a
 custom binary-only license that prohibits modification. The exact
 licensing terms can be found in os/dos/cwsdpmi/cwsdpmi.txt. The sources
-for these files can be downloaded at its author site, at:
+for these files can be downloaded at its author site, at
-[http://homer.rice.edu/~sandmann/cwsdpmi/csdpmi5s.zip](http://homer.rice.edu/~sandmann/cwsdpmi/csdpmi5s.zip)
+http://homer.rice.edu/~sandmann/cwsdpmi/csdpmi5s.zip.
 CONTRIBUTING.md is adapted from
 [Bootstrap](https://github.com/twbs/bootstrap/blob/master/CONTRIBUTING.md)
 under the [Creative Commons Attribution 3.0 Unported
 License](https://github.com/twbs/bootstrap/blob/master/docs/LICENSE)
 terms for Bootstrap documentation.
 ## X.X) Credits
@@ -711,6 +781,7 @@ for these files can be downloaded at its author site, at:
 - Christoph Elsenhans (frosch) - General coding (since 0.6)
 - Loïc Guilloux (glx) - Windows Expert (since 0.4.5)
 - Michael Lutz (michi_cc) - Path based signals (since 0.7)
 - Niels Martin Hansen (nielsm) - Music system, general coding (since 1.9)
 - Owen Rudge (orudge) - Forum host, OS/2 port (since 0.1)
 - Peter Nelson (peter1138) - Spiritual descendant from newGRF gods (since 0.4.5)
 - Ingo von Borstel (planetmaker) - General coding, Support (since 1.1)
@@ -721,7 +792,7 @@ for these files can be downloaded at its author site, at:
 ### Inactive Developers:
 - Jean-François Claeys (Belugas) - GUI, newindustries and more (0.4.5 - 1.0)
- Bjarni Corfitzen (Bjarni) - MacOSX port, coder and vehicles (0.3 - 0.7)
+- Bjarni Corfitzen (Bjarni) - macOS port, coder and vehicles (0.3 - 0.7)
 - Victor Fischer (Celestar) - Programming everywhere you need him to (0.3 - 0.6)
 - Jaroslav Mazanec (KUDr) - YAPG (Yet Another Pathfinder God) ;) (0.4.5 - 0.6)
 - Jonathan Coome (Maedhros) - High priest of the NewGRF Temple (0.5 - 0.6)
@@ -735,10 +806,10 @@ for these files can be downloaded at its author site, at:
 - Tamás Faragó (Darkvater) - Ex-Lead coder (0.3 - 0.5)
 - Dominik Scherer (dominik81) - Lead programmer, GUI expert (0.3 - 0.3)
- Emil Djupfeld (egladil) - MacOSX port (0.4 - 0.6)
+- Emil Djupfeld (egladil) - macOS port (0.4 - 0.6)
 - Simon Sasburg (HackyKid) - Bug fixer (0.4 - 0.4.5)
 - Ludvig Strigeus (ludde) - Original author of OpenTTD, main coder (0.1 - 0.3)
- Cian Duffy (MYOB)  - BeOS port / manual writing (0.1 - 0.3)
+- Cian Duffy (MYOB) - BeOS port / manual writing (0.1 - 0.3)
 - Petr Baudiš (pasky) - Many patches, newgrf support, etc. (0.3 - 0.3)
 - Benedikt Brüggemeier (skidd13) - Bug fixer and code reworker (0.6 - 0.7)
 - Serge Paquet (vurlix) - 2nd contributor after ludde (0.1 - 0.3)
@@ -760,4 +831,3 @@ for these files can be downloaded at its author site, at:
 - All Translators - For their support to make OpenTTD a truly international game
 - Bug Reporters - Thanks for all bug reports
 - Chris Sawyer - For an amazing game!
--- a/azure-pipelines-ci.yml
+++ b/azure-pipelines-ci.yml
@@ -0,0 +1,116 @@
 trigger:
 - master
 pr:
 - master
 jobs:
 - job: windows
  displayName: 'Windows'
  pool:
    vmImage: 'VS2017-Win2016'
  strategy:
    matrix:
      Win32:
        BuildPlatform: 'Win32'
      Win64:
        BuildPlatform: 'x64'
  steps:
  # Rebase to origin/master for every PR. This means users don't have to
  # rebase every time master changes. As long as the PR applies cleanly, we
  # will validate it.
  - script: |
      git config user.email 'info@openttd.org'
      git config user.name 'OpenTTD CI'
      git rebase origin/master
    displayName: 'Rebase to master'
  - bash: |
      set -ex
      curl -L https://github.com/OpenTTD/OpenTTD-CF/releases/download/latest/windows-dependencies.zip > windows-dependencies.zip
      unzip windows-dependencies.zip
      rm -f windows-dependencies.zip
    displayName: 'Download dependencies'
    workingDirectory: $(Build.ArtifactStagingDirectory)
  - script: $(Build.ArtifactStagingDirectory)\windows-dependencies\vcpkg.exe integrate install
    displayName: 'Install dependencies'
  - bash: |
      set -ex
      cd bin/baseset
      curl -L https://binaries.openttd.org/extra/opengfx/0.5.2/opengfx-0.5.2-all.zip > opengfx-0.5.2-all.zip
      unzip opengfx-0.5.2-all.zip
      rm -f opengfx-0.5.2-all.zip
    displayName: 'Install OpenGFX'
  - task: VSBuild@1
    displayName: 'Build'
    inputs:
      solution: 'projects/openttd_vs141.sln'
      platform: $(BuildPlatform)
      configuration: Release
      maximumCpuCount: true
  - script: |
      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86
      cd projects
      call regression.bat
    displayName: 'Test'
 - job: linux
  displayName: 'Linux'
  pool:
    vmImage: 'ubuntu-16.04'
  strategy:
    matrix:
      commit-checker: {}
      linux-amd64-clang-3.8: {}
      linux-amd64-gcc-6: {}
      linux-i386-gcc-6: {}
  steps:
  # Rebase to origin/master for every PR. This means users don't have to
  # rebase every time master changes. As long as the PR applies cleanly, we
  # will validate it.
  - script: |
      git config user.email 'info@openttd.org'
      git config user.name 'OpenTTD CI'
      git rebase origin/master
    displayName: 'Rebase to master'
  - task: Docker@1
    displayName: 'Build and test'
    inputs:
      command: 'Run an image'
      imageName: openttd/compile-farm-ci:$(Agent.JobName)
      volumes: '$(Build.SourcesDirectory):$(Build.SourcesDirectory)'
      workingDirectory: '$(Build.SourcesDirectory)'
      runInBackground: false
 - job: macos
  displayName: 'MacOS'
  pool:
    vmImage: 'macOS-10.13'
  steps:
  # Rebase to origin/master for every PR. This means users don't have to
  # rebase every time master changes. As long as the PR applies cleanly, we
  # will validate it.
  - script: |
      git config user.email 'info@openttd.org'
      git config user.name 'OpenTTD CI'
      git rebase origin/master
    displayName: 'Rebase to master'
  - script: HOMEBREW_NO_AUTO_UPDATE=1 brew install pkg-config lzo xz libpng
    displayName: 'Install dependencies'
  - bash: |
      set -ex
      mkdir -p ~/Documents/OpenTTD/baseset
      cd ~/Documents/OpenTTD/baseset
      wget https://binaries.openttd.org/extra/opengfx/0.5.2/opengfx-0.5.2-all.zip
      unzip opengfx-0.5.2-all.zip
      rm -f opengfx-0.5.2-all.zip
    displayName: 'Install OpenGFX'
  - script: './configure PKG_CONFIG_PATH=/usr/local/lib/pkgconfig --enable-static'
    displayName: 'Configure'
  - script: 'make -j2'
    displayName: 'Build'
  - script: 'make regression'
    displayName: 'Test'
--- a/bin/ai/regression/run.vbs
+++ b/bin/ai/regression/run.vbs
@@ -0,0 +1,154 @@
 Option Explicit
 ' $Id$
 '
 ' This file is part of OpenTTD.
 ' OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 ' OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 ' See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
 Dim FSO
 Set FSO = CreateObject("Scripting.FileSystemObject")
 Function GetTestList()
 	Dim retests, i, tests, dir
 	Set retests = New RegExp
 	Set GetTestList = CreateObject("Scripting.Dictionary")
 	retests.Pattern = "ai/regression/tst_*"
 	retests.Global = True
 	For i = 0 To WScript.Arguments.Count - 1
 		Dim test
 		test = "ai/regression/tst_" & WScript.Arguments.Item(i)
 		If FSO.FolderExists(test) Then
 			retests.Pattern = test
 			Exit For
 		End If
 	Next
 	For Each dir In FSO.GetFolder("ai/regression/").SubFolders
 		Dim name
 		name = "ai/regression/" & dir.Name
 		If retests.Test(name) Then
 			GetTestList.Add name, name
 		End If
 	Next
 End Function
 Function GetParams()
 	GetParams = "-snull -mnull -vnull:ticks=30000"
 	If WScript.Arguments.Count = 0 Then Exit Function
 	If WScript.Arguments.Item(0) <> "-r" Then Exit Function
 	GetParams = ""
 End Function
 Sub FilterFile(filename)
 	Dim lines, filter, file
 	Set file = FSO.OpenTextFile(filename, 1)
 	If Not file.AtEndOfStream Then
 		lines = file.ReadAll
 	End If
 	file.Close
 	Set filter = New RegExp
 	filter.Global = True
 	filter.Multiline = True
 	filter.Pattern = "0x(\(nil\)|0+)(x0)?"
 	lines = filter.Replace(lines, "0x00000000")
 	filter.Pattern = "^dbg: \[script\]"
 	lines = filter.Replace(lines, "")
 	filter.Pattern = "^ "
 	lines = filter.Replace(lines, "ERROR: ")
 	filter.Pattern = "ERROR: \[1\] \[P\] "
 	lines = filter.Replace(lines, "")
 	filter.Pattern = "^dbg: .*\r\n"
 	lines = filter.Replace(lines, "")
 	Set file = FSO.OpenTextFile(filename, 2)
 	file.Write lines
 	file.Close
 End Sub
 Function CompareFiles(filename1, filename2)
 	Dim file, lines1, lines2
 	Set file = FSO.OpenTextFile(filename1, 1)
 	If Not file.AtEndOfStream Then
 		lines1 = file.ReadAll
 	End IF
 	file.Close
 	Set file = FSO.OpenTextFile(filename2, 1)
 	If Not file.AtEndOfStream Then
 		lines2 = file.ReadAll
 	End IF
 	file.Close
 	CompareFiles = (lines1 = lines2)
 End Function
 Function RunTest(test, params, ret)
 	Dim WshShell, oExec, sav, command
 	Set WshShell = CreateObject("WScript.Shell")
 	' Make sure that only one info.nut is present for each test run. Otherwise openttd gets confused.
 	FSO.CopyFile "ai/regression/regression_info.nut", test & "/info.nut"
 	sav = test & "/test.sav"
 	If Not FSO.FileExists(sav) Then
 		sav = "ai/regression/empty.sav"
 	End If
 	command = ".\openttd -x -c ai/regression/regression.cfg " & params & " -g " & sav & " -d script=2 -d misc=9"
 	' 2>&1 must be after >tmp.regression, else stderr is not redirected to the file
 	WshShell.Run "cmd /c " & command & " >tmp.regression 2>&1", 0, True
 	FilterFile "tmp.regression"
 	If CompareFiles(test & "/result.txt", "tmp.regression") Then
 		RunTest = "passed!"
 	Else
 		RunTest = "failed!"
 		ret = 1
 	End If
 	FSO.DeleteFile test & "/info.nut"
 End Function
 On Error Resume Next
 WScript.StdOut.WriteLine ""
 If Err.Number <> 0 Then
 	WScript.Echo "This script must be started with cscript."
 	WScript.Quit 1
 End If
 On Error Goto 0
 If Not FSO.FileExists("ai/regression/run.vbs") Then
 	WScript.Echo "Make sure you are in the root of OpenTTD before starting this script."
 	WScript.Quit 1
 End If
 If FSO.FileExists("scripts/game_start.scr") Then
 	FSO.MoveFile "scripts/game_start.scr", "scripts/game_start.scr.regression"
 End If
 Dim params, test, ret
 params = GetParams()
 ret = 0
 For Each test in GetTestList()
 	WScript.StdOut.Write "Running " & test & "... "
 	WScript.StdOut.WriteLine RunTest(test, params, ret)
 Next
 If FSO.FileExists("scripts/game_start.scr.regression") Then
 	FSO.MoveFile "scripts/game_start.scr.regression", "scripts/game_start.scr"
 End If
 If WScript.Arguments.Count > 0 Then
 	If WScripts.Arguments.Items(0) = "-k" Then
 		WScript.Quit ret
 	End If
 End If
 FSO.DeleteFile "tmp.regression"
 WScript.Quit ret
--- a/bin/ai/regression/tst_regression/main.nut
+++ b/bin/ai/regression/tst_regression/main.nut
@@ -1018,7 +1018,36 @@ function Regression::Rail()
 	print("    BuildRail():                   " + AIRail.BuildRail(10002, 10003, 10006));
 	print("    HasTransportType():            " + AITile.HasTransportType(10005, AITile.TRANSPORT_RAIL));
 	print("    HasTransportType():            " + AITile.HasTransportType(10006, AITile.TRANSPORT_RAIL));
-	print("    RemoveRail():                  " + AIRail.RemoveRail(10005, 10004, 10001));
+	print("    RemoveRail():                  " + AIRail.RemoveRail(10006, 10005, 10002));
 	print("    HasTransportType():            " + AITile.HasTransportType(10004, AITile.TRANSPORT_RAIL));
 	print("    HasTransportType():            " + AITile.HasTransportType(10005, AITile.TRANSPORT_RAIL));
 	print("    BuildRailTrack():              " + AIRail.BuildRailTrack(6200, AIRail.RAILTRACK_NE_SW));
 	print("    RemoveRailTrack():             " + AIRail.RemoveRailTrack(6200, AIRail.RAILTRACK_NW_NE));
 	print("    RemoveRailTrack():             " + AIRail.RemoveRailTrack(6200, AIRail.RAILTRACK_NE_SW));
 	print("    BuildRail():                   " + AIRail.BuildRail(6200, 6200 + 256, 6200 + (256 * 4)));
 	print("    HasTransportType():            " + AITile.HasTransportType(6200 + (256 * 3), AITile.TRANSPORT_RAIL));
 	print("    HasTransportType():            " + AITile.HasTransportType(6200 + (256 * 4), AITile.TRANSPORT_RAIL));
 	print("    RemoveRail():                  " + AIRail.RemoveRail(6200 + (256 * 3), 6200 + (256 * 2), 6200 - 256));
 	print("    HasTransportType():            " + AITile.HasTransportType(6200 + (256 * 3), AITile.TRANSPORT_RAIL));
 	print("    HasTransportType():            " + AITile.HasTransportType(6200 + (256 * 4), AITile.TRANSPORT_RAIL));
 	print("    BuildRailTrack():              " + AIRail.BuildRail(14706, 14705, 12907));
 	print("    HasTransportType():            " + AITile.HasTransportType(13421, AITile.TRANSPORT_RAIL));
 	print("    HasTransportType():            " + AITile.HasTransportType(14191, AITile.TRANSPORT_RAIL));
 	print("    RemoveRail():                  " + AIRail.RemoveRail(12907, 13163, 14706));
 	print("    HasTransportType():            " + AITile.HasTransportType(13421, AITile.TRANSPORT_RAIL));
 	print("    HasTransportType():            " + AITile.HasTransportType(14191, AITile.TRANSPORT_RAIL));
 	print("    BuildRailTrack():              " + AIRail.BuildRailTrack(61533, AIRail.RAILTRACK_NW_SW));
 	print("    BuildRailTrack():              " + AIRail.BuildRailTrack(61533, AIRail.RAILTRACK_NE_SE));
 	print("    BuildRailTrack():              " + AIRail.BuildRailTrack(61533, AIRail.RAILTRACK_NW_NE));
 	print("    BuildRailTrack():              " + AIRail.BuildRailTrack(61533, AIRail.RAILTRACK_SW_SE));
 	print("    BuildRailTrack():              " + AIRail.BuildRailTrack(61533, AIRail.RAILTRACK_NE_SW));
 	print("    DemolishTile():                " + AITile.DemolishTile(61533));
 	print("    BuildRailTrack():              " + AIRail.BuildRailTrack(61533, AIRail.RAILTRACK_NE_SW));
 	print("    BuildRailTrack():              " + AIRail.BuildRailTrack(61533, AIRail.RAILTRACK_NW_SE));
 	print("    BuildRailTrack():              " + AIRail.BuildRailTrack(61533, AIRail.RAILTRACK_NW_NE));
 	print("    BuildRailTrack():              " + AIRail.BuildRailTrack(61533, AIRail.RAILTRACK_SW_SE));
 	print("    DemolishTile():                " + AITile.DemolishTile(61533));
 	print("    BuildRailTrack():              " + AIRail.BuildRailTrack(61533, AIRail.RAILTRACK_NW_SE));
 	print("  Depot");
 	print("    IsRailTile():                  " + AIRail.IsRailTile(33411));
@@ -1053,6 +1082,31 @@ function Regression::Rail()
 	print("    IsRailStationTile():           " + AIRail.IsRailStationTile(7957));
 	print("    IsRailStationTile():           " + AIRail.IsRailStationTile(7958));
 	print("    IsRailStationTile():           " + AIRail.IsRailStationTile(7959));
 	print("  Waypoint");
 	print("    BuildRailTrack():              " + AIRail.BuildRailTrack(12646, AIRail.RAILTRACK_NW_SE));
 	print("    BuildRailTrack():              " + AIRail.BuildRailTrack(12648, AIRail.RAILTRACK_NE_SW));
 	print("    BuildRailTrack():              " + AIRail.BuildRailTrack(12650, AIRail.RAILTRACK_NW_NE));
 	print("    BuildRailWaypoint():           " + AIRail.BuildRailWaypoint(12644));
 	print("    BuildRailWaypoint():           " + AIRail.BuildRailWaypoint(12646));
 	print("    BuildRailWaypoint():           " + AIRail.BuildRailWaypoint(12648));
 	print("    BuildRailWaypoint():           " + AIRail.BuildRailWaypoint(12650));
 	print("    IsRailWaypointTile():          " + AIRail.IsRailWaypointTile(12644));
 	print("    IsRailWaypointTile():          " + AIRail.IsRailWaypointTile(12646));
 	print("    IsRailWaypointTile():          " + AIRail.IsRailWaypointTile(12648));
 	print("    IsRailWaypointTile():          " + AIRail.IsRailWaypointTile(12650));
 	print("    RemoveRailWaypointTileRectangle():" + AIRail.RemoveRailWaypointTileRectangle(12644, 12646, false));
 	print("    RemoveRailWaypointTileRectangle():" + AIRail.RemoveRailWaypointTileRectangle(12648, 12650, true));
 	print("    IsRailWaypointTile():          " + AIRail.IsRailWaypointTile(12644));
 	print("    IsRailWaypointTile():          " + AIRail.IsRailWaypointTile(12646));
 	print("    IsRailWaypointTile():          " + AIRail.IsRailWaypointTile(12648));
 	print("    IsRailWaypointTile():          " + AIRail.IsRailWaypointTile(12650));
 	print("    HasTransportType():            " + AITile.HasTransportType(12644, AITile.TRANSPORT_RAIL));
 	print("    HasTransportType():            " + AITile.HasTransportType(12646, AITile.TRANSPORT_RAIL));
 	print("    HasTransportType():            " + AITile.HasTransportType(12648, AITile.TRANSPORT_RAIL));
 	print("    HasTransportType():            " + AITile.HasTransportType(12650, AITile.TRANSPORT_RAIL));
 	print("    DemolishTile():                " + AITile.DemolishTile(12648));
 	print("    DemolishTile():                " + AITile.DemolishTile(12650));
 }
 function Regression::Road()
@@ -1441,7 +1495,7 @@ function Regression::TileList()
 		print("    " + i + " => " + list.GetValue(i));
 	}
-	list = AITileList_StationType(4, AIStation.STATION_BUS_STOP);
+	list = AITileList_StationType(6, AIStation.STATION_BUS_STOP);
 	print("");
 	print("--TileList_StationType--");
 	print("  Count():             " + list.Count());
--- a/bin/ai/regression/tst_regression/result.txt
+++ b/bin/ai/regression/tst_regression/result.txt
@@ -1292,7 +1292,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
    GetRunningCost():   820
    GetPower():         300
    GetWeight():        47
-    GetMaxTractiveEffort(): 139
+    GetMaxTractiveEffort(): 136
    GetVehicleType():   0
    GetRailType():      0
    GetRoadType():      -1
@@ -1436,7 +1436,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
    GetRunningCost():   1968
    GetPower():         1000
    GetWeight():        131
-    GetMaxTractiveEffort(): 388
+    GetMaxTractiveEffort(): 381
    GetVehicleType():   0
    GetRailType():      0
    GetRoadType():      -1
@@ -1454,7 +1454,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
    GetRunningCost():   2296
    GetPower():         1200
    GetWeight():        162
-    GetMaxTractiveEffort(): 480
+    GetMaxTractiveEffort(): 471
    GetVehicleType():   0
    GetRailType():      0
    GetRoadType():      -1
@@ -7253,7 +7253,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
  IsBuoyTile():         false
  IsLockTile():         false
  IsCanalTile():        false
-  GetBankBalance():     479851
+  GetBankBalance():     479664
  BuildWaterDepot():    true
  BuildDock():          true
  BuildBuoy():          true
@@ -7266,7 +7266,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
  IsBuoyTile():         true
  IsLockTile():         true
  IsCanalTile():        true
-  GetBankBalance():     465257
+  GetBankBalance():     465070
 --AIWaypointList(BUOY)--
  Count():             1
@@ -7285,7 +7285,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
  IsBuoyTile():         false
  IsLockTile():         false
  IsCanalTile():        false
-  GetBankBalance():     459862
+  GetBankBalance():     459675
  BuildWaterDepot():    true
  BuildDock():          true
@@ -7334,6 +7334,35 @@ ERROR: IsEnd() is invalid as Begin() is never called
    HasTransportType():            true
    HasTransportType():            false
    RemoveRail():                  true
    HasTransportType():            false
    HasTransportType():            false
    BuildRailTrack():              true
    RemoveRailTrack():             false
    RemoveRailTrack():             true
    BuildRail():                   true
    HasTransportType():            true
    HasTransportType():            false
    RemoveRail():                  true
    HasTransportType():            true
    HasTransportType():            false
    BuildRailTrack():              true
    HasTransportType():            true
    HasTransportType():            true
    RemoveRail():                  true
    HasTransportType():            false
    HasTransportType():            false
    BuildRailTrack():              false
    BuildRailTrack():              false
    BuildRailTrack():              true
    BuildRailTrack():              true
    BuildRailTrack():              false
    DemolishTile():                true
    BuildRailTrack():              true
    BuildRailTrack():              false
    BuildRailTrack():              false
    BuildRailTrack():              false
    DemolishTile():                true
    BuildRailTrack():              true
  Depot
    IsRailTile():                  false
    BuildRailDepot():              false
@@ -7362,6 +7391,30 @@ ERROR: IsEnd() is invalid as Begin() is never called
    IsRailStationTile():           false
    IsRailStationTile():           false
    IsRailStationTile():           false
  Waypoint
    BuildRailTrack():              true
    BuildRailTrack():              true
    BuildRailTrack():              true
    BuildRailWaypoint():           false
    BuildRailWaypoint():           true
    BuildRailWaypoint():           true
    BuildRailWaypoint():           false
    IsRailWaypointTile():          false
    IsRailWaypointTile():          true
    IsRailWaypointTile():          true
    IsRailWaypointTile():          false
    RemoveRailWaypointTileRectangle():true
    RemoveRailWaypointTileRectangle():true
    IsRailWaypointTile():          false
    IsRailWaypointTile():          false
    IsRailWaypointTile():          false
    IsRailWaypointTile():          false
    HasTransportType():            false
    HasTransportType():            false
    HasTransportType():            true
    HasTransportType():            true
    DemolishTile():                true
    DemolishTile():                true
 --RailTypeList--
  Count():             1
@@ -7485,9 +7538,9 @@ ERROR: IsEnd() is invalid as Begin() is never called
  GetName(0):               Look, a station
  GetLocation(1):           29253
  GetLocation(1000):        -1
-  GetStationID(33411):      4
+  GetStationID(33411):      6
  GetStationID(34411):      65535
-  GetStationID(33411):      4
+  GetStationID(33411):      6
  HasRoadType(3, TRAM):     false
  HasRoadType(3, ROAD):     false
  HasRoadType(33411, TRAM): false
--- a/bin/baseset/orig_dos.obm
+++ b/bin/baseset/orig_dos.obm
@@ -0,0 +1,76 @@
 ; $Id$
 ;
 ; This represents the original music as on the Transport
 ; Tycoon Deluxe for DOS CD.
 ;
 [metadata]
 name              = original_dos
 shortname         = TTDD
 version           = 1
 description       = Original Transport Tycoon Deluxe DOS edition music.
 [files]
 theme = gm.cat
 old_0 = gm.cat
 old_1 = gm.cat
 old_2 = gm.cat
 old_3 = gm.cat
 old_4 = gm.cat
 old_5 = gm.cat
 old_6 = gm.cat
 old_7 = gm.cat
 old_8 =
 old_9 =
 new_0 = gm.cat
 new_1 = gm.cat
 new_2 = gm.cat
 new_3 = gm.cat
 new_4 = gm.cat
 new_5 = gm.cat
 new_6 = gm.cat
 new_7 =
 new_8 =
 new_9 =
 ezy_0 = gm.cat
 ezy_1 = gm.cat
 ezy_2 = gm.cat
 ezy_3 = gm.cat
 ezy_4 = gm.cat
 ezy_5 = gm.cat
 ezy_6 =
 ezy_7 =
 ezy_8 =
 ezy_9 =
 [md5s]
 gm.cat = 7a29d2d0c4f7d2e03091ffa9b2bdfffb
 [catindex]
 theme = 0
 old_0 = 1
 old_1 = 8
 old_2 = 2
 old_3 = 9
 old_4 = 14
 old_5 = 15
 old_6 = 19
 old_7 = 13
 new_0 = 6
 new_1 = 11
 new_2 = 10
 new_3 = 17
 new_4 = 21
 new_5 = 18
 new_6 = 5
 ezy_0 = 12
 ezy_1 = 7
 ezy_2 = 16
 ezy_3 = 3
 ezy_4 = 20
 ezy_5 = 4
 [names]
 ; Names get read from the CAT file
 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
--- a/bin/baseset/orig_tto.obm
+++ b/bin/baseset/orig_tto.obm
@@ -0,0 +1,71 @@
 ; $Id$
 ;
 ; This represents the original music as on the Transport
 ; Tycoon (with World Editor) for DOS CD.
 ;
 [metadata]
 name              = original_tto
 shortname         = TTOD
 version           = 1
 description       = Original Transport Tycoon (Original/World Editor) music.
 [files]
 theme = gm-tto.cat
 old_0 = gm-tto.cat
 old_1 = gm-tto.cat
 old_2 = gm-tto.cat
 old_3 = gm-tto.cat
 old_4 = gm-tto.cat
 old_5 = gm-tto.cat
 old_6 = gm-tto.cat
 old_7 = gm-tto.cat
 old_8 =
 old_9 =
 new_0 = gm-tto.cat
 new_1 = gm-tto.cat
 new_2 = gm-tto.cat
 new_3 = gm-tto.cat
 new_4 = gm-tto.cat
 new_5 = gm-tto.cat
 new_6 = gm-tto.cat
 new_7 = gm-tto.cat
 new_8 =
 new_9 =
 ezy_0 =
 ezy_1 =
 ezy_2 =
 ezy_3 =
 ezy_4 =
 ezy_5 =
 ezy_6 =
 ezy_7 =
 ezy_8 =
 ezy_9 =
 [catindex]
 theme = 0
 old_0 = 1
 old_1 = 6
 old_2 = 2
 old_3 = 7
 old_4 = 11
 old_5 = 12
 old_6 = 15
 old_7 = 10
 new_0 = 4
 new_1 = 5
 new_2 = 9
 new_3 = 8
 new_4 = 13
 new_5 = 16
 new_6 = 14
 new_7 = 3
 [md5s]
 gm-tto.cat = 26e85ff84b0063aa5da05dd4698fc76e
 [names]
 ; Names get read from the CAT file
 [origin]
 default      = You can find it on your Transport Tycoon CD-ROM.
--- a/bin/baseset/orig_win.obm
+++ b/bin/baseset/orig_win.obm
@@ -142,5 +142,17 @@ GM_TT19.GM = Funk Central
 GM_TT20.GM = Jammit
 GM_TT21.GM = Movin' On
 ; MIDI timecodes where the playback should attemp to start and stop short.
 ; This is to allow fixing undesired silences in original MIDI files.
 ; However not all music drivers may support this.
 [timingtrim]
 ; Theme has two beats silence at the beginning which prevents clean looping.
 GM_TT00.GM = 768:53760
 ; Can't Get There From Here from the Windows version has a long silence at the end,
 ; followed by a solo repeat. This isn't in the original DOS version music and is likely
 ; unintentional from the people who converted the music from the DOS version.
 ; Actual song ends after measure 152.
 GM_TT10.GM = 0:235008
 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,44 @@
 1.8.0 (2018-04-01)
 ------------------------------------------------------------------------
 (None)
 1.8.0-RC1 (2018-03-21)
 ------------------------------------------------------------------------
 - Feature: [GFX] Climate-specific Action5 extra airport sprites [FS#6664] (r27976)
 - Feature: Draw vertical separators at tile distance in the train depot GUI (r27938, r27899)
 - Feature: [Build] MSVC 2017 project file generator. Most noticeable, std:c++latest is enabled (r27920, r27919, r27918, r27917)
 - Feature: [Build] Project file generator for kdevelop 4/5 [FS#6577] (r27897)
 - Feature: Add option to close windows with right click [FS#4950] (r27826, r27825)
 - Feature: Vehicle Group Info: Add profits and occupancy display to group vehicle list (r27822)
 - Feature: Display aircraft type in vehicle preview/purchase/detail windows (r27802, r27799, r27797)
 - Change: [NewGRF] Various performance improvements to resolving VA2 (r27989, r27985, r27984, r27983, r27982)
 - Change: [NewGRF] Increase maximum allowed vehicle sprite size to reduce clipping of ships (r27987)
 - Change: Check companies for bankruptcy before subtracting reoccuring monthly costs [FS#6679] (r27981)
 - Change: [GFX] Replace the office building sprite on various toyland airports with a better fitting sprite [FS#6664] (r27977)
 - Change: [GFX] The switch-toolbar icon contained pixels from the fire cycle. Replace the whole icon with a new version [FS#6654] (r27961)
 - Change: Reword texts in industry view, when stockpiling is used (r27952)
 - Change: Remove the gap between windows when positioning them after opening [FS#6568] (r27934, r27900)
 - Change: [Build] Enable usage of static_assert for MSVC (r27916)
 - Change: [Build] Preserve PKG_CONFIG_PATH and PKG_CONFIG_LIBDIR environment variables in config.cache file [FS#6614] (r27902)
 - Change: Do not cancel headquarter construction and engine-preview-query when shift-clicking (r27889)
 - Change: Parse extmidi command string for parameters to pass on (r27834)
 - Change: Draw images in centre of buttons (r27829, r27821)
 - Fix: Store the map variety setting in the savegame like the other mapgen settings, so restarting maps considers it [FS#6673] (r27978)
 - Fix: Hair selection was missing one option [FS#6642] (r27975)
 - Fix: Avoid tile operations outside map border when building lock [FS#6662] (r27973)
 - Fix: Catenary sprites got mixed up for depots [FS#6670] (r27972)
 - Fix: Make automatic window-positioning RTL-aware (r27934, r27900)
 - Fix: Automatic window-positioning now uses GUI-scale/style dependent sizes/distances instead of fixed pixel values (r27934, r27900)
 - Fix: [NewGRF] While executing random triggers, var 5F should include the new triggers (r27928)
 - Fix: [NewGRF] Reset used random triggers only after all A123 chains have been resolved, so that all RA2 in all chains can test the shared triggers (r27928)
 - Fix: [NewGRF] Industry random triggers are stored per tile, even when randomising the shared random bits of the parent industry (r27928)
 - Fix: [NPF] Reserved track bits were not accounted for when trying to find any safe position (r27912)
 - Fix: Do not modify argv[0] [FS#6575] (r27886)
 - Fix: Do not search directories when opening ini files as we already have their full path [FS#6421] (r27816)
 - Fix: Road tunnel/bridge heads have no trackbits wrt. catenary drawing (r27812)
 1.7.2 (2017-12-24)
 ------------------------------------------------------------------------
 (None)
--- a/config.lib
+++ b/config.lib
@@ -31,7 +31,6 @@ set_default() {
 	awk="awk"
 	pkg_config="pkg-config"
 	os="DETECT"
 	endian="AUTO"
 	cpu_type="DETECT"
 	config_log="config.log"
 	prefix_dir="/usr/local"
@@ -78,17 +77,19 @@ set_default() {
 	enable_builtin_depend="1"
 	with_makedepend="0"
 	with_direct_music="1"
 	with_xaudio2="1"
 	with_sort="1"
 	with_iconv="1"
 	with_midi=""
 	with_midi_arg=""
 	with_libtimidity="1"
 	with_fluidsynth="1"
 	with_freetype="1"
 	with_fontconfig="1"
 	with_icu_layout="1"
 	with_icu_sort="1"
 	static_icu="0"
-	with_psp_config="1"
+	with_uniscribe="1"
 	with_threads="1"
 	with_distcc="1"
 	with_ccache="1"
@@ -109,7 +110,6 @@ set_default() {
 		awk
 		pkg_config
 		os
 		endian
 		cpu_type
 		config_log
 		prefix_dir
@@ -155,17 +155,19 @@ set_default() {
 		enable_builtin_depend
 		with_makedepend
 		with_direct_music
 		with_xaudio2
 		with_sort
 		with_iconv
 		with_midi
 		with_midi_arg
 		with_libtimidity
 		with_fluidsynth
 		with_freetype
 		with_fontconfig
 		with_icu_layout
 		with_icu_sort
 		static_icu
-		with_psp_config
+		with_uniscribe
 		with_threads
 		with_distcc
 		with_ccache
@@ -224,9 +226,6 @@ detect_params() {
 			--lipo)                       prev_p="lipo";;
 			--lipo=*)                     lipo="$optarg";;
 			--endian)                     prev_p="endian";;
 			--endian=*)                   endian="$optarg";;
 			# Alias --prefix with --prefix-dir, for compatibility with GNU autotools
@@ -375,6 +374,9 @@ detect_params() {
 			--without-libtimidity)        with_libtimidity="0";;
 			--with-libtimidity=*)         with_libtimidity="$optarg";;
 			--with-fluidsynth)            with_fluidsynth="2";;
 			--without-fluidsynth)         with_fluidsynth="0";;
 			--with-freetype)              with_freetype="2";;
 			--without-freetype)           with_freetype="0";;
 			--with-freetype=*)            with_freetype="$optarg";;
@@ -406,9 +408,9 @@ detect_params() {
 			--static-libicu)              static_icu="1";;
 			--static-libicu=*)            static_icu="$optarg";;
-			--with-psp-config)            with_psp_config="2";;
+			--with-uniscribe)             with_uniscribe="2";;
-			--without-psp-config)         with_psp_config="0";;
+			--without-uniscribe)          with_uniscribe="0";;
-			--with-psp-config=*)          with_psp_config="$optarg";;
+			--with-uniscribe=*)           with_uniscribe="$optarg";;
 			--disable-builtin-depend)     enable_builtin_depend="0";;
 			--enable-builtin-depend)      enable_builtin_depend="2";;
@@ -422,6 +424,10 @@ detect_params() {
 			--without-direct-music)       with_direct_music="0";;
 			--with-direct-music=*)        with_direct_music="$optarg";;
 			--with-xaudio2)               with_xaudio2="2";;
 			--without-xaudio2)            with_xaudio2="0";;
 			--with-xaudio2=*)             with_xaudio2="$optarg";;
 			--with-sort)                  with_sort="2";;
 			--without-sort)               with_sort="0";;
 			--with-sort=*)                with_sort="$optarg";;
@@ -537,7 +543,6 @@ check_params() {
 	# Some params want to be in full uppercase, else they might not work as
 	# expected.. fix that here
 	endian=`echo $endian | tr '[a-z]' '[A-Z]'`
 	os=`echo $os | tr '[a-z]' '[A-Z]'`
 	cpu_type=`echo $cpu_type | tr '[a-z]' '[A-Z]'`
@@ -553,21 +558,10 @@ check_params() {
 	# Check if all params have valid values
-	# Endian only allows AUTO, LE and, BE
+	# OS only allows DETECT, UNIX, OSX, FREEBSD, DRAGONFLY, OPENBSD, NETBSD, MORPHOS, BEOS, HAIKU, SUNOS, CYGWIN, MINGW, OS2, and DOS
-	if [ -z "`echo $endian | egrep '^(AUTO|LE|BE|PREPROCESSOR)$'`" ]; then
+	if [ -z "`echo $os | egrep '^(DETECT|UNIX|OSX|FREEBSD|DRAGONFLY|OPENBSD|NETBSD|HPUX|MORPHOS|BEOS|HAIKU|SUNOS|CYGWIN|MINGW|OS2|DOS)$'`" ]; then
 		log 1 "configure: error: invalid option --endian=$endian"
 		log 1 " Available options are: --endian=[AUTO|LE|BE]"
 		exit 1
 	fi
 	if [ "$endian" = "PREPROCESSOR" ] && [ "$os" != "OSX" ]; then
 		log 1 "configure: error: invalid option --endian=$endian"
 		log 1 " PREPROCESSOR is only available for OSX"
 		exit 1
 	fi
 	# OS only allows DETECT, UNIX, OSX, FREEBSD, DRAGONFLY, OPENBSD, NETBSD, MORPHOS, BEOS, HAIKU, SUNOS, CYGWIN, MINGW, OS2, DOS, WINCE, and PSP
 	if [ -z "`echo $os | egrep '^(DETECT|UNIX|OSX|FREEBSD|DRAGONFLY|OPENBSD|NETBSD|HPUX|MORPHOS|BEOS|HAIKU|SUNOS|CYGWIN|MINGW|OS2|DOS|WINCE|PSP)$'`" ]; then
 		log 1 "configure: error: invalid option --os=$os"
-		log 1 " Available options are: --os=[DETECT|UNIX|OSX|FREEBSD|DRAGONFLY|OPENBSD|NETBSD|HPUX|MORPHOS|BEOS|HAIKU|SUNOS|CYGWIN|MINGW|OS2|DOS|WINCE|PSP]"
+		log 1 " Available options are: --os=[DETECT|UNIX|OSX|FREEBSD|DRAGONFLY|OPENBSD|NETBSD|HPUX|MORPHOS|BEOS|HAIKU|SUNOS|CYGWIN|MINGW|OS2|DOS]"
 		exit 1
 	fi
 	# cpu_type can be either 32 or 64
@@ -766,13 +760,13 @@ check_params() {
 			exit 1
 		fi
 	else
-		if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "WINCE" ]; then
+		if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ]; then
 			log 1 "checking GDI video driver... found"
 		else
 			log 1 "checking GDI video driver... not Windows, skipping"
 		fi
-		if [ -z "$allegro_config" ] && [ -z "$sdl_config" ] && [ "$with_cocoa" = 0 ] && [ "$os" != "MINGW" ] && [ "$os" != "CYGWIN" ] && [ "$os" != "WINCE" ]; then
+		if [ -z "$allegro_config" ] && [ -z "$sdl_config" ] && [ "$with_cocoa" = 0 ] && [ "$os" != "MINGW" ] && [ "$os" != "CYGWIN" ]; then
 			log 1 "configure: error: no video driver development files found"
 			log 1 " If you want a dedicated server use --enable-dedicated as parameter"
 			exit 1
@@ -872,14 +866,36 @@ check_params() {
 		fi
 	fi
 	if [ "$with_uniscribe" != "0" ]; then
 		if [ "$os" != "MINGW" ]; then
 			if [ "$with_uniscribe" != "1" ]; then
 				log 1 "configure: error: Uniscribe is only supported on native Win32 targets"
 				exit 1
 			fi
 			with_uniscribe="0"
 			log 1 "checking Uniscribe text layout... not Windows, skipping"
 		else
 			log 1 "checking Uniscribe text layout... found"
 			# Don't use ICU unless forced.
 			if [ "$with_icu_layout" = "1" ]; then
 				with_icu_layout="0"
 			fi
 			if [ "$with_icu_sort" = "1" ]; then
 				with_icu_sort="0"
 			fi
 		fi
 	fi
 	detect_xdg_basedir
 	detect_png
 	detect_freetype
 	detect_fontconfig
 	detect_icu_layout
 	detect_icu_sort
 	detect_pspconfig
 	detect_libtimidity
 	detect_fluidsynth
 	if [ "$with_direct_music" != "0" ]; then
 		if [ "$os" != "MINGW" ] && [ "$os" != "CYGWIN" ]; then
@@ -895,13 +911,21 @@ check_params() {
 		fi
 	fi
-	detect_sort
+	if [ "$with_xaudio2" != "0" ]; then
 		if [ "$os" != "MINGW" ] && [ "$os" != "CYGWIN" ]; then
 			if [ "$with_xaudio2" != "1" ]; then
 				log 1 "configure: error: xaudio2 is only supported on Win32 targets"
 				exit 1
 			fi
 			with_xaudio2="0"
-	if [ "$os" = "OSX" ] && [ "$endian" = "AUTO" ]; then
+			log 1 "checking xaudio2... not Windows, skipping"
-		endian="PREPROCESSOR"
+		else
 			check_xaudio2
 		fi
 	fi
-	log 1 "checking endianness... $endian"
+	detect_sort
 	# Suppress language errors when there is a version defined, indicating a release
 	#  It just isn't pretty if any release produces warnings in the languages.
@@ -1113,7 +1137,7 @@ check_params() {
 	fi
 	if [ "$personal_dir" = "1" ]; then
-		if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "WINCE" ] || [ "$os" = "DOS" ] || [ "$os" = "HAIKU" ]; then
+		if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "DOS" ] || [ "$os" = "HAIKU" ]; then
 			personal_dir="OpenTTD"
 		elif [ "$os" = "OSX" ]; then
 			personal_dir="Documents/OpenTTD"
@@ -1211,14 +1235,14 @@ make_compiler_cflags() {
 	# $5 - name of the features variable
 	# Get the compiler to tell us who it is
-	compiler="`$1 --version | head -n1 | cut -d' ' -f1`"
+	version_line="`$1 --version | head -n1`"
 	eval eval "flags=\\\$$2"
 	eval eval "cxxflags=\\\$$3"
 	eval eval "ldflags=\\\$$4"
 	eval eval "features=\\\$$5"
-	if [ "$compiler" = "icc" ]; then
+	if [ `echo "$version_line" | cut -d' ' -f1` = "icc" ]; then
 		# Enable some things only for certain ICC versions
 		cc_version=`$1 -dumpversion | cut -c 1-4 | sed s@\\\.@@g`
@@ -1293,8 +1317,6 @@ make_compiler_cflags() {
 		if [ $cc_version -ge 110 ]; then
 			# remark #2259: non-pointer conversion from ... to ... may lose significant bits
 			flags="$flags -wd2259"
 			# Use c++0x mode so static_assert() is available
 			cxxflags="$cxxflags -std=c++11"
 		fi
 		if [ $cc_version -lt 140 ]; then
@@ -1310,9 +1332,10 @@ make_compiler_cflags() {
 				features="$features lto"
 			fi
 		fi
-	elif [ "$compiler" = "clang" ]; then
+	elif echo "$version_line" | grep -q "clang"; then
 		# Enable some things only for certain clang versions
-		cc_version="`$1 -v 2>&1 | head -n 1 | sed s@[^0-9]@@g | cut -c 1-2`"
+		# Need to try really hard to get the version line, because OSX clang likes to hide its true version
 		cc_version="`$1 -v 2>&1 | grep -i version | head -n 1 | sed s@[^0-9]@@g | cut -c 1-2`"
 		# aliasing rules are not held in openttd code
 		flags="$flags -fno-strict-aliasing"
@@ -1360,10 +1383,7 @@ make_compiler_cflags() {
 			flags="$flags -Wno-unused-variable"
 		fi
-		if [ "$cc_version" -ge "33" ]; then
+		if [ "$cc_version" -lt "33" ]; then
 			# clang completed C++11 support in version 3.3
 			flags="$flags -std=c++11"
 		else
 			log 1 "configure: error: clang version is too old: `$1 -v 2>&1 | head -n 1`, minumum: 3.3"
 			exit 1
 		fi
@@ -1426,12 +1446,6 @@ make_compiler_cflags() {
 			flags="$flags -Wnon-virtual-dtor"
 		fi
 		if [ $cc_version -ge 403 ] && [ $cc_version -lt 600 ]; then
 			# Use gnu++0x mode so static_assert() is available.
 			# Don't use c++0x, it breaks mingw (with gcc 4.4.0).
 			cxxflags="$cxxflags -std=gnu++11"
 		fi
 		if [ $cc_version -eq 405 ]; then
 			# Prevent optimisation supposing enums are in a range specified by the standard
 			# For details, see http://gcc.gnu.org/PR43680
@@ -1456,7 +1470,7 @@ make_compiler_cflags() {
 		if [ $cc_version -ge 600 ]; then
 			# -flifetime-dse=2 (default since GCC 6) doesn't play
 			# well with our custom pool item allocator
-			cxxflags="$cxxflags -flifetime-dse=1 -std=gnu++14"
+			cxxflags="$cxxflags -flifetime-dse=1"
 		fi
 		if [ "$enable_lto" != "0" ]; then
@@ -1519,6 +1533,8 @@ make_cflags_and_ldflags() {
 	CFLAGS="$CFLAGS -D$os"
 	CFLAGS_BUILD="$CFLAGS_BUILD -D$os"
 	CXXFLAGS="$CXXFLAGS -std=c++11"
 	CXXFLAGS_BUILD="$CXXFLAGS_BUILD -std=c++11"
 	if [ "$enable_debug" = "0" ]; then
 		# No debug, add default stuff
@@ -1539,9 +1555,6 @@ make_cflags_and_ldflags() {
 		# Each debug level reduces the optimization by a bit
 		if [ $enable_debug -ge 1 ]; then
 			CFLAGS="$CFLAGS -g -D_DEBUG"
 			if [ "$os" = "PSP" ]; then
 				CFLAGS="$CFLAGS -G0"
 			fi
 		fi
 		if [ $enable_debug -ge 2 ]; then
 			CFLAGS="$CFLAGS -fno-inline"
@@ -1618,23 +1631,13 @@ make_cflags_and_ldflags() {
 		fi
 	fi
-	if [ "$os" != "CYGWIN" ] && [ "$os" != "HAIKU" ] && [ "$os" != "OPENBSD" ] && [ "$os" != "MINGW" ] && [ "$os" != "MORPHOS" ] && [ "$os" != "OSX" ] && [ "$os" != "DOS" ] && [ "$os" != "WINCE" ] && [ "$os" != "PSP" ] && [ "$os" != "OS2" ]; then
+	if [ "$os" != "CYGWIN" ] && [ "$os" != "HAIKU" ] && [ "$os" != "OPENBSD" ] && [ "$os" != "MINGW" ] && [ "$os" != "MORPHOS" ] && [ "$os" != "OSX" ] && [ "$os" != "DOS" ] && [ "$os" != "OS2" ]; then
 		LIBS="$LIBS -lpthread"
 	fi
-	if [ "$os" != "CYGWIN" ] && [ "$os" != "HAIKU" ] && [ "$os" != "MINGW" ] && [ "$os" != "DOS" ] && [ "$os" != "WINCE" ]; then
+	if [ "$os" != "CYGWIN" ] && [ "$os" != "HAIKU" ] && [ "$os" != "MINGW" ] && [ "$os" != "DOS" ]; then
 		LIBS="$LIBS -lc"
 	fi
 	if [ "$os" = "WINCE" ]; then
 		LIBS="$LIBS -lcoredll -lcorelibc -laygshell -lws2 -e WinMainCRTStartup"
 	fi
 	if [ "$os" = "PSP" ]; then
 		CFLAGS="$CFLAGS -I`$psp_config -p`/include"
 		LDFLAGS="$LDFLAGS -L`$psp_config -p`/lib"
 		CFLAGS="$CFLAGS -fno-exceptions -fno-rtti -D_PSP_FW_VERSION=150"
 		LIBS="$LIBS -D_PSP_FW_VERSION=150 -lpspdebug -lpspdisplay -lpspge -lpspctrl -lpspsdk -lpspnet -lpspnet_inet -lpspnet_apctl -lpspnet_resolver -lpsputility -lpspuser -lpspkernel -lm"
 	fi
 	if [ "$os" = "MORPHOS" ]; then
 		# -Wstrict-prototypes generates much noise because of system headers
@@ -1673,14 +1676,14 @@ make_cflags_and_ldflags() {
 		CFLAGS="$CFLAGS -DUNIX"
 	fi
 	# And others like Windows
-	if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "WINCE" ]; then
+	if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ]; then
 		CFLAGS="$CFLAGS -DWIN"
 	fi
 	if [ -n "$allegro_config" ]; then
 		CFLAGS="$CFLAGS -DWITH_ALLEGRO"
 		CFLAGS="$CFLAGS `$allegro_config --cflags`"
-		if [ "$os" != "MINGW" ] && [ "$os" != "CYGWIN" ] && [ "$os" != "WINCE" ]; then
+		if [ "$os" != "MINGW" ] && [ "$os" != "CYGWIN" ]; then
 			if [ "$enable_static" != "0" ]; then
 				LIBS="$LIBS `$allegro_config --static --libs`"
 			else
@@ -1693,7 +1696,7 @@ make_cflags_and_ldflags() {
 		CFLAGS="$CFLAGS -DWITH_SDL"
 		# SDL must not add _GNU_SOURCE as it breaks many platforms
 		CFLAGS="$CFLAGS `$sdl_config --cflags | sed 's@-D_GNU_SOURCE[^ ]*@@'`"
-		if [ "$os" != "MINGW" ] && [ "$os" != "CYGWIN" ] && [ "$os" != "WINCE" ]; then
+		if [ "$os" != "MINGW" ] && [ "$os" != "CYGWIN" ]; then
 			if [ "$enable_static" != "0" ]; then
 				LIBS="$LIBS `$sdl_config --static-libs`"
 			else
@@ -1790,7 +1793,7 @@ make_cflags_and_ldflags() {
 		CFLAGS="$CFLAGS `$freetype_config --cflags | tr '\n\r' '  '`"
 		if [ "$enable_static" != "0" ]; then
-			LIBS="$LIBS `$freetype_config --libs --static | tr '\n\r' '  '`"
+			LIBS="$LIBS `$freetype_config --libs --static | tr '\n\r' '  '` -lfreetype"
 		else
 			LIBS="$LIBS `$freetype_config --libs | tr '\n\r' '  '`"
 		fi
@@ -1818,6 +1821,10 @@ make_cflags_and_ldflags() {
 		fi
 	fi
 	if [ "$with_uniscribe" != "0" ]; then
 		CFLAGS="$CFLAGS -DWITH_UNISCRIBE"
 		LIBS="$LIBS -lusp10"
 	fi
 	if [ "$with_direct_music" != "0" ]; then
 		CFLAGS="$CFLAGS -DWIN32_ENABLE_DIRECTMUSIC_SUPPORT"
@@ -1829,6 +1836,10 @@ make_cflags_and_ldflags() {
 		fi
 	fi
 	if [ "$with_xaudio2" != "0" ]; then
 		CFLAGS="$CFLAGS -DWITH_XAUDIO2"
 	fi
 	if [ -n "$libtimidity_config" ]; then
 		CFLAGS="$CFLAGS -DLIBTIMIDITY"
 		CFLAGS="$CFLAGS `$libtimidity_config --cflags | tr '\n\r' '  '`"
@@ -1840,6 +1851,11 @@ make_cflags_and_ldflags() {
 		fi
 	fi
 	if [ -n "$fluidsynth" ]; then
 		LIBS="$LIBS -lfluidsynth"
 		CFLAGS="$CFLAGS -DFLUIDSYNTH"
 	fi
 	if [ "$with_iconv" != "0" ]; then
 		CFLAGS="$CFLAGS -DWITH_ICONV"
 		if [ "$link_to_iconv" = "yes" ]; then
@@ -2129,7 +2145,7 @@ check_cxx_host() {
 }
 check_windres() {
-	if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "WINCE" ]; then
+	if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ]; then
 		check_compiler "host windres" "windres" "$host" "$windres" "$WINDRES" "windres" "windres" "2" "-V"
 	fi
 }
@@ -2196,9 +2212,7 @@ check_direct_music() {
 	echo "
 		#include <windows.h>
 		#include <dmksctrl.h>
 		#include <dmusici.h>
 		#include <dmusicc.h>
 		#include <dmusicf.h>
 		int main(int argc, char *argv[]) { }" > direct_music.test.c
 	$cxx_host $CFLAGS direct_music.test.c -o direct_music.test 2> /dev/null
 	res=$?
@@ -2217,6 +2231,35 @@ check_direct_music() {
 	fi
 }
 check_xaudio2() {
 	echo "
 		#include <windows.h>
 		#undef NTDDI_VERSION
 		#undef _WIN32_WINNT
 		#define NTDDI_VERSION    NTDDI_WIN8
 		#define _WIN32_WINNT	 _WIN32_WINNT_WIN8
 		#include <xaudio2.h>
 		int main(int argc, char *argv[]) { }" > xaudio2.test.c
 	$cxx_host $CFLAGS xaudio2.test.c -o xaudio2.test 2> /dev/null
 	res=$?
 	rm -f xaudio2.test.c xaudio2.test
 	if [ "$res" != "0" ]; then
 		if [ "$with_xaudio2" != "1" ]; then
 			log 1 "configure: error: xaudio2 is not available on this system"
 			exit 1
 		fi
 		with_xaudio2="0"
 		log 1 "checking xaudio2... not found"
 	else
 		log 1 "checking xaudio2... found"
 	fi
 }
 check_makedepend() {
 	if [ "$enable_builtin_depend" != "0" ]; then
 		with_makedepend="0"
@@ -2335,7 +2378,7 @@ detect_awk() {
 detect_os() {
 	if [ "$os" = "DETECT" ]; then
-		# Detect UNIX, OSX, FREEBSD, DRAGONFLY, OPENBSD, NETBSD, HPUX, MORPHOS, BEOS, SUNOS, CYGWIN, MINGW, OS2, DOS, WINCE, and PSP
+		# Detect UNIX, OSX, FREEBSD, DRAGONFLY, OPENBSD, NETBSD, HPUX, MORPHOS, BEOS, SUNOS, CYGWIN, MINGW, OS2, and DOS
 		# Try first via dumpmachine, then via uname
 		os=`echo "$host" | tr '[A-Z]' '[a-z]' | $awk '
@@ -2355,8 +2398,6 @@ detect_os() {
 					/mingw/        { print "MINGW";     exit}
 					/os2/          { print "OS2";       exit}
 					/dos/          { print "DOS";       exit}
 					/wince/        { print "WINCE";     exit}
 					/psp/          { print "PSP";       exit}
 		'`
 		if [ -z "$os" ]; then
@@ -2382,7 +2423,7 @@ detect_os() {
 		if [ -z "$os" ]; then
 			log 1 "detecting OS... none detected"
 			log 1 "I couldn't detect your OS. Please use --os=OS to force one"
-			log 1 "Allowed values are: UNIX, OSX, FREEBSD, DRAGONFLY, OPENBSD, NETBSD, MORPHOS, HPUX, BEOS, HAIKU, SUNOS, CYGWIN, MINGW, OS2, DOS, WINCE, and PSP"
+			log 1 "Allowed values are: UNIX, OSX, FREEBSD, DRAGONFLY, OPENBSD, NETBSD, MORPHOS, HPUX, BEOS, HAIKU, SUNOS, CYGWIN, MINGW, OS2, and DOS"
 			exit 1
 		fi
@@ -2641,6 +2682,11 @@ detect_library() {
 		eval "res=\$$2"
 		if [ -z "$res" ]; then
 			log 2 "  trying /mingw/include/$4$5... no"
 			eval "$2=`ls -1 /mingw$cpu_type/include/$4*.h 2>/dev/null | egrep \"\/$5\$\"`"
 		fi
 		eval "res=\$$2"
 		if [ -z "$res" ]; then
 			log 2 "  trying /mingw$cpu_type/include/$4$5... no"
 			eval "$2=`ls -1 /opt/local/include/$4*.h 2>/dev/null | egrep \"\/$5\$\"`"
 		fi
 		eval "res=\$$2"
@@ -2689,6 +2735,11 @@ detect_library() {
 			eval "res=\$$2"
 			if [ -z "$res" ]; then
 				log 2 "  trying /mingw/lib/$3... no"
 				eval "$2=`ls /mingw$cpu_type/lib/*.a 2>/dev/null | egrep \"\/$3\$\"`"
 			fi
 			eval "res=\$$2"
 			if [ -z "$res" ]; then
 				log 2 "  trying /mingw$cpu_type/lib/$3... no"
 				log 1 "configure: error: $2 couldn't be found"
 				log 1 "configure: error: you requested a static link, but I can't find $3"
@@ -2741,6 +2792,10 @@ detect_libtimidity() {
 	detect_pkg_config "$with_libtimidity" "libtimidity" "libtimidity_config" "0.1" "1"
 }
 detect_fluidsynth() {
 	detect_library "$with_fluidsynth" "fluidsynth" "" "" "fluidsynth.h"
 }
 detect_pkg_config() {
 	# $1 - config-param ($with_lzma value)
 	# $2 - package name ('liblzma')
@@ -2825,7 +2880,7 @@ detect_fontconfig() {
 		fontconfig_config=""
 		return 0
 	fi
-	if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "WINCE" ]; then
+	if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ]; then
 		log 1 "checking libfontconfig... WIN32, skipping"
 		fontconfig_config=""
 		return 0
@@ -2841,62 +2896,25 @@ detect_fontconfig() {
 }
 detect_icu_layout() {
 	if [ "$with_cocoa" != "0" ] && [ "$with_icu_layout" = "1" ]; then
 		log 1 "checking icu-lx... OSX, skipping"
 		icu_layout_config=""
 		return 0
 	fi
 	detect_pkg_config "$with_icu_layout" "icu-lx" "icu_layout_config" "4.8" "1"
 }
 detect_icu_sort() {
 	if [ "$with_cocoa" != "0" ] && [ "$with_icu_sort" = "1" ]; then
 		log 1 "checking icu-i18n... OSX, skipping"
 		icu_sort_config=""
 		return 0
 	fi
 	detect_pkg_config "$with_icu_sort" "icu-i18n" "icu_sort_config" "4.8" "1"
 }
 detect_pspconfig() {
 	# 0 means no, 1 is auto-detect, 2 is force
 	if [ "$with_psp_config" = "0" ]; then
 		log 1 "checking psp-config... disabled"
 		psp_config=""
 		return 0
 	fi
 	if [ "$with_psp_config" = "1" ] && [ "$os" != "PSP" ]; then
 		log 1 "checking psp-config... not PSP, skipping"
 		psp_config="";
 		return 0
 	fi
 	if [ "$os" != "PSP" ]; then
 		log 1 "checking psp-config... not PSP"
 		log 1 "configure: error: psp-config is only supported for PSP"
 		exit 1
 	fi
 	if [ "$with_psp_config" = "1" ] || [ "$with_psp_config" = "" ] || [ "$with_psp_config" = "2" ]; then
 		psp_config="psp-config"
 	else
 		psp_config="$with_psp_config"
 	fi
 	version=`$psp_config -p 2>/dev/null`
 	ret=$?
 	log 2 "executing $psp_config -p"
 	log 2 "  returned $version"
 	log 2 "  exit code $ret"
 	if [ -z "$version" ] || [ "$ret" != "0" ]; then
 		log 1 "checking psp-config... not found"
 		log 1 "configure: error: psp-config couldn't be found"
 		# It was forced, so it should be found.
 		if [ "$with_psp_config" != "1" ]; then
 			log 1 "configure: error: you supplied '$with_psp_config', but it seems invalid"
 		fi
 		exit 1
 	fi
 	log 1 "checking psp-config... found"
 }
 detect_iconv() {
 	# 0 means no, 1 is auto-detect, 2 is force
 	if [ "$with_iconv" = "0" ]; then
@@ -2915,10 +2933,16 @@ detect_iconv() {
 	# Try to find iconv.h, seems to only thing to detect iconv with
 	if [ "$with_iconv" = "1" ] || [ "$with_iconv" = "" ] || [ "$with_iconv" = "2" ]; then
-		iconv=`ls -1 /usr/include 2>/dev/null | grep "iconv.h"`
+		# Iterate over search paths
-		if [ -z "$iconv" ]; then
+		iconv=""
-			iconv=`ls -1 /usr/local/include 2>/dev/null | grep "iconv.h"`
+		search_paths=`LC_ALL=C $cxx_host $OSX_SYSROOT $CFLAGS -E - -v </dev/null 2>&1 | \
-		fi
+		              $awk '/#include <...> search starts here:/{flag=1;next}/End of search list./{flag=0}flag'`
 		for path in $search_paths; do
 			iconv=`ls -1 $path 2>/dev/null | grep "iconv.h"`
 			if [ -n "$iconv" ]; then
 				break
 			fi
 		done
 	else
 		# Make sure it exists
 		iconv=`ls $with_iconv/include/iconv.h 2>/dev/null`
@@ -3262,17 +3286,14 @@ make_sed() {
 		s@!!INSTALL_DIR!!@$install_dir@g;
 		s@!!BINARY_NAME!!@$binary_name@g;
 		s@!!STRGEN!!@$STRGEN@g;
 		s@!!ENDIAN_CHECK!!@$ENDIAN_CHECK@g;
 		s@!!DEPEND!!@$DEPEND@g;
 		s@!!SETTINGSGEN!!@$SETTINGSGEN@g;
 		s@!!ENDIAN_FORCE!!@$endian@g;
 		s@!!STAGE!!@$STAGE@g;
 		s@!!MAKEDEPEND!!@$makedepend@g;
 		s@!!CFLAGS_MAKEDEP!!@$cflags_makedep@g;
 		s@!!SORT!!@$sort@g;
 		s@!!CONFIG_CACHE_COMPILER!!@config.cache.compiler@g;
 		s@!!CONFIG_CACHE_LINKER!!@config.cache.linker@g;
 		s@!!CONFIG_CACHE_ENDIAN!!@config.cache.endian@g;
 		s@!!CONFIG_CACHE_SOURCE!!@config.cache.source@g;
 		s@!!CONFIG_CACHE_VERSION!!@config.cache.version@g;
 		s@!!CONFIG_CACHE_SOURCE_LIST!!@config.cache.source.list@g;
@@ -3506,8 +3527,7 @@ showhelp() {
 	echo "  --os=OS                        the OS we are compiling for [DETECT]"
 	echo "                                 DETECT/UNIX/OSX/FREEBSD/DRAGONFLY/OPENBSD/"
 	echo "                                 NETBSD/MORPHOS/HPUX/BEOS/SUNOS/CYGWIN/"
-	echo "                                 MINGW/OS2/DOS/WINCE/PSP/HAIKU"
+	echo "                                 MINGW/OS2/DOS/HAIKU"
 	echo "  --endian=ENDIAN                set the endian of the HOST (AUTO/LE/BE)"
 	echo ""
 	echo "Paths:"
 	echo "  --prefix-dir=dir               specifies the prefix for all installed"
@@ -3578,6 +3598,7 @@ showhelp() {
 	echo "                                 midi-player"
 	echo "  --with-libtimidity[=\"pkg-config libtimidity\"]"
 	echo "                                 enables libtimidity support"
 	echo "  --with-fluidsynth              enables fluidsynth support"
 	echo "  --with-allegro[=\"pkg-config allegro\"]"
 	echo "                                 enables Allegro video driver support"
 	echo "  --with-cocoa                   enables COCOA video driver (OSX ONLY)"
@@ -3603,7 +3624,6 @@ showhelp() {
 	echo "  --static-icu                   try to link statically (libsicu instead of"
 	echo "                                 libicu; can fail as the new name is guessed)"
 	echo "  --with-iconv[=iconv-path]      enables iconv support"
 	echo "  --with-psp-config[=psp-config] enables psp-config support (PSP ONLY)"
 	echo "  --disable-builtin-depend       disable use of builtin deps finder"
 	echo "  --with-makedepend[=makedepend] enables makedepend support"
 	echo "  --with-ccache                  enables ccache support"
--- a/6
+++ b/6
@@ -75,13 +75,12 @@ save_params
 make_cflags_and_ldflags
 EXE=""
-if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "OS2" ] || [ "$os" = "DOS" ] || [ "$os" = "WINCE" ]; then
+if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "OS2" ] || [ "$os" = "DOS" ]; then
 	EXE=".exe"
 fi
 TTD="openttd$EXE"
 STRGEN="strgen$EXE"
 ENDIAN_CHECK="endian_check$EXE"
 DEPEND="depend$EXE"
 SETTINGSGEN="settings_gen$EXE"
@@ -114,7 +113,6 @@ AWKCOMMAND='
 		if ($0 == "PNG"         && "'$png_config'" == "")          { next; }
 		if ($0 == "OSX"         && "'$os'" != "OSX")               { next; }
 		if ($0 == "OS2"         && "'$os'" != "OS2")               { next; }
 		if ($0 == "PSP"         && "'$os'" != "PSP")               { next; }
 		if ($0 == "DEDICATED"   && "'$enable_dedicated'" != "1")   { next; }
 		if ($0 == "AI"          && "'$enable_ai'" == "0")          { next; }
 		if ($0 == "COCOA"       && "'$with_cocoa'" == "0")         { next; }
@@ -124,10 +122,10 @@ AWKCOMMAND='
 		if ($0 == "WIN32"       && "'$os'" != "MINGW" &&
 		                 "'$os'" != "CYGWIN" && "'$os'" != "MSVC") { next; }
 		if ($0 == "MORPHOS"     && "'$os'" != "MORPHOS")           { next; }
 		if ($0 == "WINCE"       && "'$os'" != "WINCE")             { next; }
 		if ($0 == "MSVC"        && "'$os'" != "MSVC")              { next; }
 		if ($0 == "DIRECTMUSIC" && "'$with_direct_music'" == "0")  { next; }
 		if ($0 == "LIBTIMIDITY" && "'$libtimidity'" == "" )        { next; }
 		if ($0 == "FLUIDSYNTH"  && "'$fluidsynth'" == "" )         { next; }
 		if ($0 == "HAVE_THREAD" && "'$with_threads'" == "0")       { next; }
 		if ($0 == "SSE"         && "'$with_sse'" != "1")           { next; }
--- a/docs/Readme_Windows_MSVC.md
+++ b/docs/Readme_Windows_MSVC.md
@@ -0,0 +1,70 @@
 # Compiling OpenTTD using Microsoft Visual C++
 Last updated: 2018-12-27
 ## Supported MSVC compilers
 OpenTTD includes projects for Visual Studio 2015 Update 3 or more recent.
 You can download the free Visual Studio Community Edition from Microsoft at
 https://visualstudio.microsoft.com/vs/community/.
 ## Required files
 ### Microsoft platform files
 OpenTTD needs the Platform SDK, if it isn't installed already. This can be
 done during installing Visual Studio, by selecting
 `Visual C++ MFC for x86 and x64` (and possibly
 `Visual C++ ATL for x86 and x64` depending on your version). If not, you
 can get it at this location:
 - [MS Windows Platform SDK](http://www.microsoft.com/downloads/details.aspx?FamilyId=A55B6B43-E24F-4EA3-A93E-40C0EC4F68E5&displaylang=en)
 Install the SDK by following the instructions as given.
 ### OpenTTD dependencies
 Dependencies for OpenTTD on Windows are handled via
 [vcpkg](https://github.com/Microsoft/vcpkg/). First you need to install vcpkg
 by following the `Quick Start` intructions of their
 [README](https://github.com/Microsoft/vcpkg/blob/master/README.md).
 After this, you can install the dependencies OpenTTD needs. We advise to use
 the `static` versions, and OpenTTD currently needs the following dependencies:
 - freetype
 - liblzma
 - libpng
 - lzo
 - zlib
 To install both the x64 (64bit) and x86 (32bit) variants, you can use:
 ```ps
 .\vcpkg install freetype:x64-windows-static liblzma:x64-windows-static libpng:x64-windows-static lzo:x64-windows-static zlib:x64-windows-static
 .\vcpkg install freetype:x86-windows-static liblzma:x86-windows-static libpng:x86-windows-static lzo:x86-windows-static zlib:x86-windows-static
 ```
 ## TTD Graphics files
 See section 4.1 of README.md for the required 3rdparty files and how to install them.
 ## Compiling
 Open the appropriate `sln` (Solution) file for your version of Visual Studio:
 - VS 2015: projects/openttd_vs140.sln
 - VS 2017: projects/openttd_vs141.sln
 Set the build mode to `Release` in
 `Build > Configuration manager > Active solution configuration`.
 You can now compile.
 If everything works well the binary should be in `objs\Win[32|64]\Release\openttd.exe`
 and in `bin\openttd.exe`
 ## Problems
 If compilation fails, double-check that you are using the latest github
 source. If it still doesn't work, check in on IRC (irc://irc.oftc.net/openttd),
 to ask for help.
--- a/docs/Readme_Windows_MSVC.txt
+++ b/docs/Readme_Windows_MSVC.txt
@@ -1,108 +0,0 @@
 Compiling OpenTTD using Microsoft Visual C++
 Last updated: 2010-01-03
 --------------------------------------------
 PLEASE READ THE ENTIRE DOCUMENT BEFORE DOING ANY ACTUAL CHANGES!!
 SUPPORTED MSVC COMPILERS
 ------------------------
 OpenTTD includes projects for MSVC 2005.NET and MSVC 2008.NET. Both will
 compile out of the box, providing you have the required libraries/headers;
 which ones, see below. There is no support for VS6 or MSVC 2002, or
 MSVC 2003.NET. You are therefore strongly encouraged to either upgrade to
 MSVC 2008 Express (free) or use GCC.
 1) REQUIRED FILES
 -----------------
 You might already have some of the files already installed, so check before
 downloading; mostly because the DirectX SDK and Platform SDK are about
 500MB each.
 Download the following files:
 	* openttd-useful.zip (http://binaries.openttd.org/extra/openttd-useful/)
 	* DirectX 8.1 SDK (http://neuron.tuke.sk/~mizanin/eng/Dx81sdk-include-lib.rar) (or alternatively the latest DirectX SDK from Microsoft)
 	* MS Windows Platform SDK (http://www.microsoft.com/downloads/details.aspx?FamilyId=A55B6B43-E24F-4EA3-A93E-40C0EC4F68E5&displaylang=en)
 	* afxres.h (http://www-d0.fnal.gov/d0dist/dist/packages/d0ve/devel/windows/AFXRES.H)
 ...and of course the newest source from svn://svn.openttd.org/trunk
 You need an SVN-client to download the source from subversion:
 	* CLI Subversion (http://subversion.tigris.org/)
 	* GUI TortoiseSVN (http://tortoisesvn.tigris.org/)
 2) INCLUDES AND LIBRARIES
 -------------------------
 Put the newly downloaded files in the VC lib\ and include\ directories; where
 "C:\Program Files\Microsoft Visual Studio 9.0\VC" is your location of Visual C.
 If you are compiling for an x64 system, use the include\ and lib\ directories
 from the win64/ folder.
 	* openttd-useful.zip\include\*
 	* afxresh.h
 	to >	C:\Program Files\Microsoft Visual Studio 9.0\VC\Include
 	* openttd-useful.zip\lib\*
 	to >	C:\Program Files\Microsoft Visual Studio 9.0\VC\Lib
 Custom directories might be recommended, check 2.2)
 2.1) INCLUDES AND LIBRARIES - DIRECTX/PLATFORM SDK
 --------------------------------------------------
 Basically the same procedure as with the useful zip file, providing
 you are not using the Microsoft installer. Put the include files in the
 include\ directory and the library files to the Lib\ directory.
 It is recommended to use custom directories so you don't overwrite any
 default header or library files.
 2.2) CUSTOM DIRECTORIES
 -----------------------
 If you have put the above include and/or library files into custom folders,
 MSVC will not find them by default. You need to add these paths to VC through:
 Tools > Options > Projects and Solutions > VC++ Directories > show directories for
 	* Include files: Add the DirectX/Platform SDK include dir you've created
 	* Library files: Add the path to the SDK custom lib dir
 NOTE: make sure that the directory for the DirectX SDK is the first one in the
 list, above all others, otherwise compilation will most likely fail!!
 3) TTD GRAPHICS FILES
 ---------------------
 See section 4.1 of README.md for the required 3rdparty files and how to install them.
 4) COMPILING
 ------------
 Open trunk/openttd_vs[89]0.sln
 Set the build mode to 'Release' in
 Build > Configuration manager > Active solution configuration > select "Release"
 Compile...
 If everything works well the binary should be in trunk/objs/Win[32|64]/Release/openttd.exe
 5) EDITING, CHANGING SOURCE CODE
 --------------------------------
 Set the build mode (back to) 'Debug'
 Change the startup project to openttd by right-clicking the 'openttd' project
 in the Solution Explorer and selecting 'Set as Startup Project'. The 'openttd'
 project should now show up bold instead of 'strgen'.
 6) PROBLEMS?
 ------------
 If compilation fails, double-check that you are using the latest SVN (!)
 source. If it still doesn't work, check in on IRC (irc://irc.oftc.net/openttd),
 to ask about reasons; or just wait. The problem will most likely solve itself
 within a few days as the problem is noticed and fixed.
 An up-to-date version of this README can be found on the wiki:
 http://wiki.openttd.org/Microsoft_Visual_C%2B%2B_2008_Express_Editions
--- a/docs/landscape.html
+++ b/docs/landscape.html
@@ -226,7 +226,7 @@
     <li>m1 bits 4..0: <a href="#OwnershipInfo">owner</a> of the tile</li>
     <li>m2: see signals</li>
     <li>m3 bits 7..4: see signals</li>
-     <li>m3 bits 3..0 = <a name="TrackType">track type</a>:
+     <li>m8 bits 5..0 = <a name="TrackType">track type</a>:
      <table>
       <tr>
        <td><tt>0</tt>&nbsp; </td>
@@ -626,7 +626,8 @@
       <li>m5 bit 6 set: level crossing
        <ul>
         <li>m1 bits 4..0: <a href="#OwnershipInfo">owner</a> of the railway track</li>
-         <li>m3 bits 3..0: <a href="#TrackType">railway track type</a></li>
+         <li>m5 bit 5: set if crossing lights are on</li>
         <li>m5 bit 4: pbs reservation state</li>
         <li>m5 bit 0: direction
          <table>
           <tr>
@@ -639,9 +640,8 @@
           </tr>
          </table>
         </li>
         <li>m5 bit 5: set if crossing lights are on</li>
         <li>m7 bits 4..0: <a href="#OwnershipInfo">owner</a> of the road type 0 (normal road)</li>
-         <li>m5 bit 4: pbs reservation state</li>
+         <li>m8 bits 5..0: <a href="#TrackType">railway track type</a></li>
        </ul>
       </li>
      </ul>
@@ -860,7 +860,6 @@
     <li>m2: index into the array of stations</li>
     <li>m3 bits 7..4: persistent random data for railway stations/waypoints and airports)</li>
     <li>m3 bits 7..4: <a href="#OwnershipInfo">owner</a> of tram tracks (road stop)</li>
     <li>m3 bits 3..0: <a href="#TrackType">track type</a> for railway stations/waypoints</li>
     <li>m4: custom station id; 0 means standard graphics</li>
     <li>m5: graphics index (range from 0..255 for each station type):
      <table>
@@ -979,6 +978,7 @@
     <li>m7 bits 4..0: <a href="#OwnershipInfo">owner</a> of road (road stops)</li>
     <li>m7 bits 7..6: present road types (road stops)</li>
     <li>m7: animation frame (railway stations/waypoints, airports)</li>
     <li>m8 bits 5..0: <a href="#TrackType">track type</a> for railway stations/waypoints</li>
    </ul>
   </td>
  </tr>
@@ -1444,7 +1444,6 @@
    <ul>
     <li>m1 bits 4..0: <a href="#OwnershipInfo">owner</a></li>
     <li>m3 bits 7..4: <a href="#OwnershipInfo">owner</a> of tram</li>
     <li>m3 bits 3..0: <a href="#TrackType">track type</a> for railway</li>
     <li>m5 bit 4: pbs reservation state for railway</li>
     <li>m5 bits 7 clear: tunnel entrance/exit</li>
     <li>m5 bit 7 set: bridge ramp
@@ -1582,6 +1581,7 @@
     <li>m7 bits 4..0: <a href="#OwnershipInfo">owner</a> of road</li>
     <li>m7 bit 5 set = on snow or desert</li>
     <li>m7 bits 7..6: present road types for road</li>
     <li>m8 bits 5..0: <a href="#TrackType">track type</a> for railway</li>
    </ul>
   </td>
  </tr>
--- a/docs/landscape_grid.html
+++ b/docs/landscape_grid.html
@@ -37,6 +37,7 @@ the array so you can quickly see what is used and what is not.
  <li><span style="font-weight: bold;">m5</span> - 8 bits in size, is used for general storage</li>
  <li><span style="font-weight: bold;">m6</span> - 8 bits in size, is used for general storage</li>
  <li><span style="font-weight: bold;">m7</span> - 8 bits in size, is used for general storage</li>
  <li><span style="font-weight: bold;">m8</span> - 16 bits in size, is used for general storage</li>
 </ul>
 <table align=center border="1" cellpadding="2" cellspacing="2">
@@ -52,6 +53,7 @@ the array so you can quickly see what is used and what is not.
      <th>m5 (8)</th>
      <th>m6 (8)</th>
      <th>m7 (8)</th>
      <th>m8 (16)</th>
    </tr>
    <tr>
      <td colspan=2 class="caption">bits</td>
@@ -64,6 +66,7 @@ the array so you can quickly see what is used and what is not.
      <td class="bits">7654 3210</td>
      <td class="bits">7654 3210</td>
      <td class="bits">7654 3210</td>
      <td class="bits">FEDC BA98 7654 3210</td>
    </tr>
    <tr>
      <td rowspan="2">0</td>
@@ -77,6 +80,7 @@ the array so you can quickly see what is used and what is not.
      <td class="bits">XXXX XXXX</td>
      <td class="bits"><span class="free">OOO</span>X XX<span class="free">OO</span></td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
    </tr>
    <tr>
      <td class="caption">farmland</td>
@@ -89,6 +93,7 @@ the array so you can quickly see what is used and what is not.
      <td class="bits">-inherit-</td>
      <td class="bits"><span class="free">OOO</span>X XX<span class="free">OO</span></td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
    </tr>
    <tr>
      <td rowspan=3>1</td>
@@ -97,11 +102,12 @@ the array so you can quickly see what is used and what is not.
      <td class="bits">XXXX XXXX</td>
      <td class="bits"><span class="free">OOO</span>X XXXX</td>
      <td class="bits"><span class="free">OOOO</span> XXXX <span class="free">OOOO OOOO</span></td>
-      <td class="bits"><span class="free">OOOO</span> XXXX</td>
+      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits"><span class="free">OOOO</span> XXXX</td>
      <td class="bits">XXXX XXXX</td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits"><span class="free">OOOO OOOO OO</span>XX XXXX</td>
    </tr>
    <tr>
      <td class="caption">rail with signals</td>
@@ -109,11 +115,12 @@ the array so you can quickly see what is used and what is not.
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
      <td class="bits"><span class="free">OOOO</span> XXXX XXXX XXXX</td>
-      <td class="bits">XXXX XXXX</td>
+      <td class="bits">XXXX <span class="free">OOOO</span></td>
      <td class="bits">XXXX XXXX</td>
      <td class="bits">-inherit-</td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits">-inherit-</td>
    </tr>
    <tr>
      <td class="caption">depot</td>
@@ -121,11 +128,12 @@ the array so you can quickly see what is used and what is not.
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
      <td class="bits">XXXX XXXX XXXX XXXX</td>
-      <td class="bits"><span class="free">OOOO</span> XXXX</td>
+      <td class="bits">-inherit-</td>
      <td class="bits"><span class="free">OOOO</span> XXXX</td>
      <td class="bits">XX<span class="free">O</span>X <span class="free">OO</span>XX</td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits">-inherit-</td>
    </tr>
    <tr>
      <td rowspan=3>2</td>
@@ -139,6 +147,7 @@ the array so you can quickly see what is used and what is not.
      <td class="bits">XXXX XXXX</td>
      <td class="bits"><span class="free">OO</span>XX X<span class="free">OOO</span></td>
      <td class="bits">XXX<span class="free">O</span> XXXX</td>
      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
    </tr>
    <tr>
      <td class="caption">level crossing</td>
@@ -146,11 +155,12 @@ the array so you can quickly see what is used and what is not.
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
-      <td class="bits">XXXX XXXX</td>
+      <td class="bits">XXXX <span class="free">OOOO</span></td>
-      <td class="bits">-inherit-</td>
+      <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits">XXXX<span class="free"> OOO</span>X</td>
+      <td class="bits">XXXX <span class="free">OOO</span>X</td>
      <td class="bits"><span class="free">OO</span>XX X<span class="free">OOO</span></td>
      <td class="bits">XXXX XXXX</td>
      <td class="bits"><span class="free">OOOO OOOO OO</span>XX XXXX</td>
    </tr>
    <tr>
      <td class="caption">road depot</td>
@@ -163,6 +173,7 @@ the array so you can quickly see what is used and what is not.
      <td class="bits">XX<span class="free">OO OO</span>XX</td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits">XXX<span class="free">O</span> XXXX</td>
      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
    </tr>
    <tr>
      <td>3</td>
@@ -176,6 +187,7 @@ the array so you can quickly see what is used and what is not.
      <td class="bits">XXX<span class="abuse">X XXXX</span></td>
      <td class="bits"><span class="abuse">XXXX XX</span><span class="free">OO</span></td>
      <td class="bits">XXXX <span class="abuse">XXXX</span></td>
      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
    </tr>
    <tr>
      <td>4</td>
@@ -189,6 +201,7 @@ the array so you can quickly see what is used and what is not.
      <td class="bits">XX<span class="free">OO O</span>XXX</td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
    </tr>
    <tr>
      <td rowspan=7>5</td>
@@ -197,11 +210,12 @@ the array so you can quickly see what is used and what is not.
      <td class="bits">XXXX XXXX</td>
      <td class="bits"><span class="free">O</span>XXX XXXX</td>
      <td class="bits">XXXX XXXX XXXX XXXX</td>
-      <td class="bits">XXXX XXXX</td>
+      <td class="bits">XXXX <span class="free">OOOO</span></td>
      <td class="bits">XXXX XXXX</td>
      <td class="bits">XXXX XXXX</td>
      <td class="bits"><span class="free">OO</span>XX XX<span class="free">OO</span></td>
      <td class="bits">XXXX XXXX</td>
      <td class="bits"><span class="free">OOOO OOOO OO</span>XX XXXX</td>
    </tr>
    <tr>
      <td class="caption">rail waypoint</td>
@@ -214,6 +228,7 @@ the array so you can quickly see what is used and what is not.
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
    </tr>
    <tr>
      <td class="caption">road stop</td>
@@ -226,6 +241,7 @@ the array so you can quickly see what is used and what is not.
      <td class="bits"><span class="option">~~~~ ~</span>XXX</td>
      <td class="bits"><span class="free">OO</span>XX X<span class="free">OOO</span></td>
      <td class="bits">XX<span class="free">O</span>X XXXX</td>
      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
    </tr>
    <tr>
      <td class="caption">dock</td>
@@ -238,6 +254,7 @@ the array so you can quickly see what is used and what is not.
      <td class="bits"><span class="option">~~~~ ~</span>XXX</td>
      <td class="bits"><span class="free">OO</span>XX X<span class="free">OOO</span></td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
    </tr>
    <tr>
      <td class="caption">airport</td>
@@ -250,6 +267,7 @@ the array so you can quickly see what is used and what is not.
      <td class="bits">XXXX XXXX</td>
      <td class="bits"><span class="free">OO</span>XX X<span class="free">OOO</span></td>
      <td class="bits">XXXX XXXX</td>
      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
    </tr>
    <tr>
      <td class="caption">buoy</td>
@@ -262,6 +280,7 @@ the array so you can quickly see what is used and what is not.
      <td class="bits"><span class="option">~~~~ ~~~~</span></td>
      <td class="bits"><span class="free">OO</span>XX X<span class="free">OOO</span></td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
    </tr>
    <tr>
      <td class="caption">oilrig</td>
@@ -274,6 +293,7 @@ the array so you can quickly see what is used and what is not.
      <td class="bits"><span class="option">~~~~ ~~~~</span></td>
      <td class="bits"><span class="free">OO</span>XX X<span class="free">OOO</span></td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
    </tr>
    <tr>
      <td rowspan=3>6</td>
@@ -287,6 +307,7 @@ the array so you can quickly see what is used and what is not.
      <td class="bits">X<span class="option">~~</span>X XXXX</td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
    </tr>
    <tr>
      <td class="caption">canal, river</td>
@@ -299,6 +320,7 @@ the array so you can quickly see what is used and what is not.
      <td class="bits">-inherit-</td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
    </tr>
    <tr>
      <td class="caption">shipdepot</td>
@@ -311,6 +333,7 @@ the array so you can quickly see what is used and what is not.
      <td class="bits">-inherit-</td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
    </tr>
    <tr>
      <td>8</td>
@@ -324,6 +347,7 @@ the array so you can quickly see what is used and what is not.
      <td class="bits">XXXX XXXX</td>
      <td class="bits"><span class="free">OO</span>XX XX<span class="free">OO</span></td>
      <td class="bits">XXXX XXXX</td>
      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
    </tr>
    <tr>
      <td rowspan=2>9</td>
@@ -332,23 +356,25 @@ the array so you can quickly see what is used and what is not.
      <td class="bits">XXXX XXXX</td>
      <td class="bits"><span class="free">OOO</span>X XXXX</td>
      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
-      <td class="bits">XXXX XXXX</td>
+      <td class="bits">XXXX <span class="free">OOOO</span></td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits">X<span class="free">OO</span>X XXXX</td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits">XXXX XXXX</td>
      <td class="bits"><span class="free">OOOO OOOO OO</span>XX XXXX</td>
    </tr>
    <tr>
      <td>bridge ramp</td>
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
+      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
      <td class="bits"><span class="free">OO</span>XX XX<span class="free">OO</span></td>
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
    </tr>
    <tr>
      <td rowspan=2>A</td>
@@ -362,6 +388,7 @@ the array so you can quickly see what is used and what is not.
      <td class="bits">XXXX XXXX</td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits">XXXX XXXX</td>
      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
    </tr>
  </tbody>
 </table>
--- a/docs/obm_format.txt
+++ b/docs/obm_format.txt
@@ -45,12 +45,15 @@ description.en_US = howdie
 ; The file names are case sensitive.
 ; You can have empty file names; in that case no song will be loaded
 ; for that 'entry'.
 ; If you want to load music from the MPS DOS music driver "cat" format,
 ; specify just the name of the .cat file the song is located in, then
 ; fill out the "catindex" section.
 [files]
 ; The theme song for OpenTTD
 theme = THEME_SONG.GM
 ; The songs in the 'old style' category
-old_0 =
+old_0 = GM.CAT
-old_1 =
+old_1 = GM.CAT
 old_2 =
 old_3 =
 old_4 =
@@ -86,9 +89,17 @@ ezy_9 =
 ; Note that the list of files is case sensitive. Each file listed in the
 ; files section must be listed here with it's song name, otherwise you
 ; will get a lot of warnings when starting OpenTTD.
 ; You don't need to fill this out for "cat" format music, the song names
 ; are loaded directly from the file in that case.
 [names]
 THEME_SONG.GM = Tycoon DELUXE Theme
 ; If you are loading music from the DOS version "cat" format, specify
 ; which index into the file the song has.
 [catindex]
 old_0 = 1
 old_1 = 3
 ; The md5s section lists the MD5 checksum for the files that replace them.
 ; Note that the list of files is case sensitive. Each file listed in the
 ; files section must be listed here with it's MD5 checksum, otherwise you
@@ -96,6 +107,13 @@ THEME_SONG.GM = Tycoon DELUXE Theme
 [md5s]
 THEME_SONG.GM = 45cfec1b9d8c7a0ad45e755833cbf221
 ; If a song needs to have parts of the start or end cut off to avoid long
 ; silences, you can specify MIDI tick codes for start:end of the actual
 ; music part for each file here.
 ; Not all music drivers might support this feature.
 [timingtrim]
 THEME_SONG.GM = 768:53760
 ; The origin section provides the possibility to put and extra line into
 ; the warning that a file is missing/corrupt. This can be used to tell
 ; them where to find it. It works on the filename specified in the
--- a/known-bugs.txt
+++ b/known-bugs.txt
@@ -1,6 +1,6 @@
 OpenTTD's known bugs
-Last updated:    2016-07-01
+Last updated:    2018-11-05
-Release version: 1.6.1
+Release version: 1.9.0
 ------------------------------------------------------------------------
@@ -14,12 +14,12 @@ Table of contents
 ---- -----
 All bugs listed below are marked as known. Please do not submit any bugs
 that are the same as these. If you do, do not act surprised, because
-we WILL flame you!!
+we WILL flame you!
 The current list of known bugs that we intend to fix can be found in our
-bug tracking system at: http://bugs.openttd.org
+bug tracking system at https://github.com/OpenTTD/OpenTTD/issues
-Also check the closed bugs when searching for your bug in this system as
+Also check the closed bugs when searching for your bug in this system as we
-we might have fixed the bug in the mean time.
+might have fixed the bug in the mean time.
 2.0) Known bugs
@@ -29,436 +29,383 @@ reasons why we think that fixing them is infeasible. We might make some
 minor improvements that reduce the scope of these bugs, but we will not
 be able to completely fix them.
-No suitable AI can be found
+No suitable AI can be found:
-	If you have no AIs and an AI is started the so-called 'dummy' AI will
+        If you have no AIs and an AI is started the so-called 'dummy' AI will
-	be loaded. This AI does nothing but writing a message on the AI debug
+        be loaded. This AI does nothing but writing a message on the AI debug
-	window and showing a red warning. There are basically two solutions
+        window and showing a red warning. There are basically two solutions
-	for this problem: Either you set the number of AI players to 0 so that
+        for this problem: Either you set the number of AI players to 0 so that
-	no AI is started. You find that setting at the top of the window in the
+        no AI is started. You find that setting at the top of the window in the
-	"AI / Game Scripts Settings" window.
+        "AI / Game Scripts Settings" window.
-	The other solution is acquiring (downloading) some AI. The easiest way
+        The other solution is acquiring (downloading) some AI. The easiest way
-	to do this is via the "Check Online Content" button in the main (intro)
+        to do this is via the "Check Online Content" button in the main (intro)
-	menu or directly in the "AI / Game Scripts Settings" dialogue via the
+        menu or directly in the "AI / Game Scripts Settings" dialogue via the
-	"Check Online Content" button.
+        "Check Online Content" button.
-After a while of playing, colours get corrupted
+After a while of playing, colours get corrupted:
-	In Windows 7 the background slideshow corrupts the colour mapping of
+        In Windows 7 the background slideshow corrupts the colour mapping
-	OpenTTD's 8bpp screen modes. Workarounds for this are:
+        of OpenTTD's 8bpp screen modes. Workarounds for this are:
-		a) Switching to windowed mode, instead of fullscreen
+                a) Switching to windowed mode, instead of fullscreen
-		b) Switching off background slideshow
+                b) Switching off background slideshow
-		c) Setting up the 32bpp-anim or 32bpp-optimized blitter
+                c) Setting up the 32bpp-anim or 32bpp-optimized blitter
-Long delay between switching songs/music
+Custom vehicle type name is incorrectly aligned:
-	On Windows there is a delay of a (few) second(s) between switching of
+        Some NewGRFs use sprites that are bigger than normal in the "buy
-	songs for the "win32" driver. This delay is caused by the fact that
+        vehicle" window. Due to this they have to encode an offset for
-	opening a MIDI file via MCI is extremely slow.
+        the vehicle type name. Upon renaming the vehicle type this encoded
        offset is stripped from the name because the "edit box" cannot show
        this encoding. As a result the custom vehicle type names will get
        the default alignment. The only way to (partially) fix this is by
        adding spaces to the custom name.
-	DirectMusic, known as "dmusic" in OpenTTD, has a much shorter delay.
+Clipping problems [#119]:
-	However, under some circumstances DirectMusic does not reset its
+        In some cases sprites are not drawn as one would expect. Examples of
-	state properly causing wrongly pitched/bad sounding songs. This
+        this are aircraft that might be hidden below the runway or trees that
-	problem is in DirectMusic as it is reproducable with Microsoft's
+        in some cases are rendered over vehicles.
-	DirectMusic Producer. DirectMusic has been deprecated since 2004
+        The primary cause of this problem is that OpenTTD does not have enough
-	and as such has no support for 64 bits OpenTTD.
+        data (like a 3D model) to properly determine what needs to be drawn in
        front of what. OpenTTD has bounding boxes but in lots of cases they
        are either too big or too small and then cause problems with what
        needs to be drawn in front of what. Also some visual tricks are used.
        For example trains at 8 pixels high, the catenary needs to be drawn
        above that. When you want to draw bridges on top of that, which are
        only one height level (= 8 pixels) higher, you are getting into some
        big problems.
        We can not change the height levels; it would require us to either
        redraw all vehicle or all landscape graphics. Doing so would mean we
        leave the Transport Tycoon graphics, which in effect means OpenTTD
        will not be a Transport Tycoon clone anymore.
-	As a delay is favourable over bad sounding music the "win32" driver
+Mouse scrolling not possible at the edges of the screen [#383] [#3966]:
-	is the default driver for OpenTTD. You can change this default by
+        Scrolling the viewport with the mouse cursor at the edges of the screen
-	setting the "musicdriver" in your openttd.cfg to "dmusic".
+        in the same direction of the edge will fail. If the cursor is near the
        edge the scrolling will be very slow.
        OpenTTD only receives cursor position updates when the cursor is inside
        OpenTTD's window. It is not told how far you have moved the cursor
        outside of OpenTTD's window.
-Custom vehicle type name is incorrectly aligned
+Lost trains ignore (block) exit signals [#1473]:
-	Some NewGRFs use sprites that are bigger than normal in the "buy
+        If trains are lost they ignore block exit signals, blocking junctions
-	vehicle" window. Due to this they have to encode an offset for the
+        with presignals. This is caused because the path finders cannot tell
-	vehicle type name. Upon renaming the vehicle type this encoded offset
+        where the train needs to go. As such a random direction is chosen at
-	is stripped from the name because the "edit box" cannot show this
+        each junction. This causes the trains to occasionally to make choices
-	encoding. As a result the custom vehicle type names will get the
+        that are unwanted from a player's point of view.
-	default alignment. The only way to (partly) fix this is by adding
+        This will not be fixed because lost trains are in almost all cases a
-	spaces to the custom name.
+        network problem, e.g. a train can never reach a specific place. This
        makes the impact of fixing the bug enormously small against the amount
        of work needed to write a system that prevents the lost trains from
        taking the wrong direction.
-Clipping problems [FS#119]
+Vehicle owner of last transfer leg gets paid for all [#2427]:
-	In some cases sprites are not drawn as one would expect. Examples of
+        When you make a transfer system that switches vehicle owners. This
-	this are aircraft that might be hidden below the runway or trees that
+        is only possible with 'industry stations', e.g. the oil rig station
-	in some cases are rendered over vehicles.
+        the owner of the vehicle that does the final delivery gets paid for
-	The primary cause of this problem is that OpenTTD does not have enough
+        the whole trip. It is not shared amongst the different vehicle
-	data (like a 3D model) to properly determine what needs to be drawn in
+        owners that have participated in transporting the cargo.
-	front of what. OpenTTD has bounding boxes but in lots of cases they
+        This sharing is not done because it would enormously increase the
-	are either too big or too small and then cause problems with what
+        memory and CPU usage in big games for something that is happening
-	needs to be drawn in front of what. Also some visual tricks are used.
+        in only one corner case. We think it is not worth the effort until
-	For example trains at 8 pixels high, the catenary needs to be drawn
+        sharing of stations is an official feature.
 	above that. When you want to draw bridges on top of that, which are
 	only one height level (= 8 pixels) higher, you are getting into some
 	big problems.
 	We can not change the height levels; it would require us to either
 	redraw all vehicle or all landscape graphics. Doing so would mean we
 	leave the Transport Tycoon graphics, which in effect means OpenTTD
 	will not be a Transport Tycoon clone anymore.
-Mouse scrolling not possible at the edges of the screen [FS#383] [FS#3966]
+Forbid 90 degree turns does not work for crossing PBS paths [#2737]:
-	Scrolling the viewport with the mouse cursor at the edges of the screen
+        When you run a train through itself on a X junction with PBS turned on
-	in the same direction of the edge will fail. If the cursor is near the
+        the train will not obey the 'forbid 90 degree turns' setting. This is
-	edge the scrolling will be very slow.
+        due to the fact that we can not be sure that the setting was turned
-	OpenTTD only receives cursor position updates when the cursor is inside
+        off when the track was reserved, which means that we assume it was
-	OpenTTD's window. It is not told how far you have moved the cursor
+        turned on and that the setting does not hold at the time. We made it
-	outside of OpenTTD's window.
+        this way to allow one to change the setting in-game, but it breaks
        slightly when you are running your train through itself. Running a
        train through means that your network is broken and is thus a user
        error which OpenTTD tries to graciously handle.
        Fixing this bug means that we need to record whether this particular
        setting was turned on or off at the time the reservation was made. This
        means adding quite a bit of data to the savegame for solving an issue
        that is basically an user error. We think it is not worth the effort.
-Lost trains ignore (block) exit signals [FS#1473]
+Duplicate (station) names after renaming [#3204]:
-	If trains are lost they ignore block exit signals, blocking junctions
+        After renaming stations one can create duplicate station names. This
-	with presignals. This is caused because the path finders cannot tell
+        is done giving a station the same custom name as another station with
-	where the train needs to go. As such a random direction is chosen at
+        an automatically generated name.
-	each junction. This causes the trains to occasionally to make choices
+        The major part of this problem is that station names are translatable.
-	that are unwanted from a player's point of view.
+        Meaning that a station is called e.g. '<TOWN> Central' in English and
-	This will not be fixed because lost trains are in almost all cases a
+        '<TOWN> Centraal' in Dutch. This means that in network games the
-	network problem, e.g. a train can never reach a specific place. This
+        renaming of a town could cause the rename to succeed on some clients
-	makes the impact of fixing the bug enormously small against the
+        and fail at others. This creates an inconsistent game state that will
-	amount of work needed to write a system that prevents the lost trains
+        be seen as a 'desync'. Secondly the custom names are intended to fall
-	from taking the wrong direction.
+        completely outside of the '<TOWN> <name>' naming of stations, so when
        you rename a town all station names are updated accordingly.
        As a result the decision has been made that all custom names are only
        compared to the other custom names in the same class and not compared
        to the automatically generated names.
-Vehicle owner of last transfer leg gets paid for all [FS#2427]
+Extreme CPU usage/hangs when using SDL and PulseAudio [#3294],
-	When you make a transfer system that switches vehicle owners. This
+OpenTTD hangs/freezes when closing, OpenTTD is slow, OpenTTD uses a lot of CPU:
-	is only possible with 'industry stations', e.g. the oil rig station
+        OpenTTD can be extremely slow/use a lot of CPU when the sound is
-	the owner of the vehicle that does the final delivery gets paid for
+        played via SDL and then through PulseAudio's ALSA wrapper. Under the
-	the whole trip. It is not shared amongst the different vehicle
+        same configuration OpenTTD, or rather SDL, might hang when exiting
-	owners that have participated in transporting the cargo.
+        the game. This problem is seen most in Ubuntu 9.04 and higher.
 	This sharing is not done because it would enormously increase the
 	memory and CPU usage in big games for something that is happening
 	in only one corner case. We think it is not worth the effort until
 	sharing of stations is an official feature.
-Forbid 90 degree turns does not work for crossing PBS paths [FS#2737]
+        This is because recent versions of the PulseAudio sound server
-	When you run a train through itself on a X junction with PBS turned on
+        are configured to use timer-based audio scheduling rather than
-	the train will not obey the 'forbid 90 degree turns' setting. This is
+        interrupt-based audio scheduling. Configuring PulseAudio to force
-	due to the fact that we can not be sure that the setting was turned
+        use of interrupt-based scheduling may resolve sound problems for
-	off when the track was reserved, which means that we assume it was
+        some users. Under recent versions of Ubuntu Linux (9.04 and higher)
-	turned on and that the setting does not hold at the time. We made it
+        this can be accomplished by changing the following line in the
-	this way to allow one to change the setting in-game, but it breaks
+        /etc/pulse/default.pa file:
-	slightly when you are running your train through itself. Running a
+                load-module module-udev-detect
-	train through means that your network is broken and is thus a user
+        to
-	error which OpenTTD tries to graciously handle.
+                load-module module-udev-detect tsched=0
-	Fixing this bug means that we need to record whether this particular
+        Note that PulseAudio must be restarted for changes to take effect. Older
-	setting was turned on or off at the time the reservation was made. This
+        versions of PulseAudio may use the module-hal-detect module instead.
-	means adding quite a bit of data to the savegame for solving an issue
+        Adding tsched=0 to the end of that line will have a similar effect.
 	that is basically an user error. We think it is not worth the effort.
-Duplicate (station) names after renaming [FS#3204]
+        Another possible solution is selecting the "pulse" backend of SDL
-	After renaming stations one can create duplicate station names. This
+        by either using "SDL_AUDIODRIVER=pulse openttd" at the command
-	is done giving a station the same custom name as another station with
+        prompt or installing the 'libsdl1.2debian-pulseaudio' package from
-	an automatically generated name.
+        Ubuntu's Universe repository. For other distributions a similar
-	The major part of this problem is that station names are translatable.
+        package needs to be installed.
 	Meaning that a station is called e.g. '<TOWN> Central' in English and
 	'<TOWN> Centraal' in Dutch. This means that in network games the
 	renaming of a town could cause the rename to succeed on some clients
 	and fail at others. This creates an inconsistent game state that will
 	be seen as a 'desync'. Secondly the custom names are intended to fall
 	completely outside of the '<TOWN> <name>' naming of stations, so when
 	you rename a town all station names are updated accordingly.
 	As a result the decision has been made that all custom names are only
 	compared to the other custom names in the same class and not compared
 	to the automatically generated names.
-Extreme CPU usage/hangs when using SDL and PulseAudio [FS#3294]
+OpenTTD not properly resizing with SDL on X [#3305]:
-OpenTTD hangs/freezes when closing, OpenTTD is slow, OpenTTD uses a lot of CPU
+        Under some X window managers OpenTTD's window does not properly
-	OpenTTD can be extremely slow/use a lot of CPU when the sound is
+        resize. You will either end up with a black bar at the right/bottom
-	played via SDL and then through PulseAudio's ALSA wrapper. Under the
+        side of the window or you cannot see the right/bottom of the window,
-	same configuration OpenTTD, or rather SDL, might hang when exiting
+        e.g. you cannot see the status bar. The problem is that OpenTTD does
-	the game. This problem is seen most in Ubuntu 9.04 and higher.
+        not always receive a resize event from SDL making it impossible for
-
+        OpenTTD to know that the window was resized; sometimes moving the
-	This is because recent versions of the PulseAudio sound server are
+        window will solve the problem.
-	configured to use timer-based audio scheduling rather than
+        Window managers that are known to exhibit this behaviour are GNOME's
-	interrupt-based audio scheduling. Configuring PulseAudio to force
+        and KDE's. With the XFCE's and LXDE's window managers the resize
-	use of interrupt-based scheduling may resolve sound problems for
+        event is sent when the user releases the mouse.
 	some users. Under recent versions of Ubuntu Linux (9.04 and higher)
 	this can be accomplished by changing the following line in the
 	/etc/pulse/default.pa file:
 		load-module module-udev-detect
 	to
 		load-module module-udev-detect tsched=0
 	Note that PulseAudio must be restarted for changes to take effect.
 	Older versions of PulseAudio may use the module-hal-detect module
 	instead. Adding tsched=0 to the end of that line will have a similar
 	effect.
 	Another possible solution is selecting the "pulse" backend of SDL
 	by either using "SDL_AUDIODRIVER=pulse openttd" at the command
 	prompt or installing the 'libsdl1.2debian-pulseaudio' package from
 	Ubuntu's Universe repository. For other distributions a similar
 	package needs to be installed.
 OpenTTD not properly resizing with SDL on X [FS#3305]
 	Under some X window managers OpenTTD's window does not properly
 	resize. You will either end up with a black bar at the right/bottom
 	side of the window or you cannot see the right/bottom of the window,
 	e.g you cannot see the status bar. The problem is that OpenTTD does
 	not always receive a resize event from SDL making it impossible for
 	OpenTTD to know that the window was resized; sometimes moving the
 	window will solve the problem.
 	Window managers that are known to exhibit this behaviour are KDE's
 	and GNOME's. With the XFCE's and LXDE's window managers the resize
 	event is sent when the user releases the mouse.
 Incorrect colours, crashes upon exit, debug warnings and smears upon
-window resizing with SDL on Mac OS X [FS#3447]
+window resizing with SDL on macOS [#3447]:
-	Video handling with (lib)SDL under Mac OS X is known to fail on some
+        Video handling with (lib)SDL under macOS is known to fail on some
-	versions of Mac OS X with some hardware configurations. Some of the
+        versions of macOS with some hardware configurations. Some of
-	problems happen only under some circumstances whereas others are
+        the problems happen only under some circumstances whereas others
-	always present.
+        are always present.
-	We suggest that the SDL video/sound backend is not used for OpenTTD
+        We suggest that the SDL video/sound backend is not used for OpenTTD
-	in combinations with Mac OS X.
+        in combinations with macOS.
-Train crashes entering same junction from block and path signals [FS#3928]
+Train crashes entering same junction from block and path signals [#3928]:
-	When a train has reserved a path from a path signal to a two way
+        When a train has reserved a path from a path signal to a two way
-	block signal and the reservation passes a path signal through the
+        block signal and the reservation passes a path signal through the
-	back another train can enter the reserved path (only) via that same
+        back another train can enter the reserved path (only) via that
-	two way block signal.
+        same two way block signal.
-	The reason for this has to do with optimisation; to fix this issue
+        The reason for this has to do with optimisation; to fix this issue
-	the signal update has to pass all path signals until it finds either
+        the signal update has to pass all path signals until it finds either
-	a train or a backwards facing signal. This is a very expensive task.
+        a train or a backwards facing signal. This is a very expensive task.
-	The (signal) setups that allow these crashes can furthermore be
+        The (signal) setups that allow these crashes can furthermore be
-	considered incorrectly signalled; one extra safe waiting point for
+        considered incorrectly signalled; one extra safe waiting point for
-	the train entering from path signal just after the backwards facing
+        the train entering from path signal just after the backwards facing
-	signal (from the path signal train) resolves the issue.
+        signal (from the path signal train) resolves the issue.
-Crashes when playing music [FS#3941]
+Crashes when run in a VM using Parallels Desktop [#4003]:
-	Mac OS X's QuickTime (default music driver) and Windows' MCI (win32
+        When the Windows version of OpenTTD is executed in a VM under
-	music driver) crash on some songs from OpenMSX. OpenTTD cannot do
+        Parallels Desktop a privileged instruction exception may be thrown.
-	anything about this. Please report these crashes to the authors of
+        As OpenTTD works natively on macOS as well as natively on Windows and
-	OpenMSX so the crash causing songs can be removed or fixed.
+        these native builds both don't exhibit this behaviour this crash is
        most likely due to a bug in the virtual machine, something out of
        the scope of OpenTTD. Most likely this is due to Parallels Desktop
        lacking support for RDTSC calls. The problem can be avoided by using
        other VM-software, Wine, or running natively on macOS.
-Crashes when run in a VM using Parallels Desktop [FS#4003]
+Entry- and exit signals are not dragged [#4378]:
-	When the Windows version of OpenTTD is executed in a VM under
+        Unlike all other signal types, the entry- and exit signals are not
-	Parallels Desktop a privileged instruction exception may be thrown.
+        dragged but instead normal signals are placed on subsequent track
-	As OpenTTD works natively on OSX as well as natively on	Windows and
+        sections. This is done on purpose as this is the usually more
-	these native builds both don't exhibit this behaviour this crash is
+        convenient solution. There are little to no occasions where more
-	most likely due to a bug in the virtual machine, something out of
+        than one entry or exit signal in a row are useful. This is different
-	the scope of OpenTTD. Most likely this is due to Parallels Desktop
+        for all other signal types where several in a row can serve one
-	lacking support for RDTSC calls. The problem can be avoided by using
+        purpose or another.
 	other VM-software, Wine, or running natively on OSX.
-OpenTTD hangs when started on 32 bits Windows [FS#4083]
+Station build date is incorrect [#4415]:
-	Under some circumstances OpenTTD might hang for hours on the
+        The tile query tool will show the date of the last (re)construction
-	initialisation of the music driver. The exact circumstances are
+        at the station and not the date of the first construction. This is
-	unknown except that it is the "dmusic" music driver that has the
+        due to compatability reasons with NewGRFs and the fact that it is
-	problem and that the "win32" music driver does not.
+        wrong to say that the station is built in a particular year when it
-	As a result using the "win32" music driver will work around this
+        was completely destroyed/rebuilt later on.
-	issue.
+        The tile query tool can be fixed by changing the "Build date" text
        to "Date at which the last (re)construction took place" but this is
        deemed too specific and long for that window.
-	As the exact circumstances are unknown, and the obvious
+(Temporary) wrong colours when switching to full screen [#4511]:
-	configuration settings related to the music driver are at their
+        On Windows it can happen that you temporarily see wrong colours
-	default we are not able to detect this failure, except when Windows'
+        when switching to full screen OpenTTD, either by starting
-	music initialisation function returns after several hours and then
+        OpenTTD in full screen mode, changing to full screen mode or by
-	there is no point in switching the music driver anymore.
+        ALT-TAB-ing into a full screen OpenTTD. This is caused by the
-	The reason we still use the "win32" music driver as default are
+        fact that OpenTTD, by default, uses 8bpp paletted output. The
-	described in the "Long delay between switching music/song" section
+        wrong colours you are seeing is a temporary effect of the video
-	of this document.
+        driver switching to 8bpp palette mode.
-Pre- and exit signals are not dragged [FS#4378]
+        This issue can be worked around in two ways:
-	Unlike all other signal types, the entry- and exit signals are not
+                a) Setting fullscreen_bpp to 32
-	dragged but instead normal signals are placed on subsequent track
+                b) Setting up the 32bpp-anim or 32bpp-optimized blitter
 	sections. This is done on purpose as this is the usually more con-
 	venient solution. There are little to no occasions where more than
 	one entry or exit signal in a row are useful. This is different
 	for all other signal types where several in a row can serve one
 	purpose or another.
-Station build date is incorrect [FS#4415]
+Can't run OpenTTD with the -d option from a MSYS console [#4587]:
-	The tile query tool will show the date of the last (re)construction
+        The MSYS console does not allow OpenTTD to open an extra console for
-	at the station and not the date of the first construction. This is
+        debugging output. Compiling OpenTTD with the --enable-console
-	due to compatability reasons with NewGRFs and the fact that it is
+        configure option prevents this issue and allows the -d option to use
-	wrong to say that the station is built in a particular year when it
+        the MSYS console for its output.
 	was completely destroyed/rebuilt later on.
 	The tile query tool can be fixed by changing the "Build date" text
 	to "Date at which the last (re)construction took place" but this is
 	deemed too specific and long for that window.
-Can't change volume inside OpenTTD [FS#4416]
+Unreadable characters for non-latin locales [#4607]:
-	Some backends do not provide a means to change the volume of sound
+        OpenTTD does not ship a non-latin font in its graphics files. As a
-	effects or music. The mixing of music and sound is left to external
+        result OpenTTD needs to acquire the font from somewhere else. What
-	libraries/the operating system we can't handle the volume control
+        OpenTTD does is ask the operating system, or a system library, for
-	in OpenTTD. As a result you can't change the volume inside OpenTTD
+        the best font for a given language if the currently loaded font
-	for backends such as SDL; just use the volume control provided by
+        does not provide all characters of the chosen translation. This
-	your operating system.
+        means that OpenTTD has no influence over the quality of the chosen
        font; it just does the best it can do.
-Can't run OpenTTD with the -d option from a MSYS console [FS#4587]
+        If the text is unreadable there are several steps that you can take
-	The MSYS console does not allow OpenTTD to open an extra console for
+        to improve this. The first step is finding a good font and configure
-	debugging output. Compiling OpenTTD with the --enable-console
+        this in the configuration file. See section 9.0 of README.md for
-	configure option prevents this issue and allows the -d option to use
+        more information. You can also increase the font size to make the
-	the MSYS console for its output.
+        characters bigger and possible better readable.
-Unreadable characters for non-latin locales [FS#4607]
+        If the problem is with the clarity of the font you might want to
-	OpenTTD does not ship a non-latin font in its graphics files. As a
+        enable anti-aliasing by setting the small_aa/medium_aa/large_aa
-	result OpenTTD needs to acquire the font from somewhere else. What
+        settings to "true". However, anti-aliasing only works when a 32-bit
-	OpenTTD does is ask the operating system, or a system library, for
+        blitter has been selected, e.g. blitter = "32bpp-anim", as with the
-	the best font for a given language if the currently loaded font
+        8 bits blitter there are not enough colours to properly perform the
-	does not provide all characters of the chosen translation. This
+        anti-aliasing.
 	means that OpenTTD has no influence over the quality of the chosen
 	font; it just does the best it can do.
-	If the text is unreadable there are several steps that you can take
+Train does not crash with itself [#4635]:
-	to improve this. The first step is finding a good font and configure
+        When a train drives in a circle the front engine passes through
-	this in the configuration file. See section 9.0 of readme.txt for
+        wagons of the same train without crashing. This is intentional.
-	more information. You can also increase the font size to make the
+        Signals are only aware of tracks, they do not consider the train
-	characters bigger and possible better readable.
+        length and whether there would be enough room for a train in some
        circle it might drive on. Also the path a train might take is not
        necessarily known when passing a signal.
        Checking all circumstances would take a lot of additional
        computational power for signals, which is not considered worth
        the effort, as it does not add anything to gameplay.
        Nevertheless trains shall not crash in normal operation, so making
        a train not crash with itself is the best solution for everyone.
-	If the problem is with the clarity of the font you might want to
+Aircraft coming through wall in rotated airports [#4705]:
-	enable anti-aliasing by setting the small_aa/medium_aa/large_aa
+        With rotated airports, specifically hangars, you will see that the
-	settings to "true". However, anti-aliasing only works when a 32 bits
+        aircraft will show a part through the back wall of the hangar.
-	blitter has been selected, e.g. blitter = "32bpp-anim", as with the
+        This can be solved by only drawing a part of the plane when being
-	8 bits blitter there are not enough colours to properly perform the
+        at the back of the hangar, however then with transparency turned on
-	anti-aliasing.
+        the aircraft would be shown partially which would be even weirder.
        As such the current behaviour is deemed the least bad.
        The same applies to overly long ships and their depots.
-(Temporary) wrong colours when switching to full screen [FS#4511]:
+Vehicles not keeping their "maximum" speed [#4815]:
-	On Windows it can happen that you temporarily see wrong colours
+        Vehicles that have not enough power to reach and maintain their
-	when switching to full screen OpenTTD, either by starting
+        advertised maximum speed might be constantly jumping between two
-	OpenTTD in full screen mode, changing to full screen mode or by
+        speeds. This is due to the fact that speed and its calculations
-	ALT-TAB-ing into a full screen OpenTTD. This is caused by the
+        are done with integral numbers instead of floating point numbers.
-	fact that OpenTTD, by default, uses 8bpp paletted output. The
+        As a result of this a vehicle will never reach its equilibrium
-	wrong colours you are seeing is a temporary effect of the video
+        between the drag/friction and propulsion. So in effect it will be
-	driver switching to 8bpp palette mode.
+        in a vicious circle of speeding up and slowing down due to being
        just at the other side of the equilibrium.
-	This issue can be worked around in two ways:
+        Not speeding up when near the equilibrium will cause the vehicle to
-		a) Setting fullscreen_bpp to 32
+        never come in the neighbourhood of the equilibrium and not slowing
-		b) Setting up the 32bpp-anim or 32bpp-optimized blitter
+        down when near the equilibrium will cause the vehicle to never slow
        down towards the equilibrium once it has come down a hill.
-Train does not crash with itself [FS#4635]:
+        It is possible to calculate whether the equilibrium will be passed,
-	When a train drives in a circle the front engine passes through
+        but then all acceleration calculations need to be done twice.
 	wagons of the same train without crashing. This is intentional.
 	Signals are only aware of tracks, they do not consider the train
 	length and whether there would be enough room for a train in some
 	circle it might drive on. Also the path a train might take is not
 	necessarily known when passing a signal.
 	Checking all circumstances would take a lot of additional computational
 	power for signals, which is not considered worth the effort, as
 	it does not add anything to gameplay.
 	Nevertheless trains shall not crash in normal operation, so making
 	a train not crash with itself is the best solution for everyone.
-Aircraft coming through wall in rotated airports [FS#4705]:
+Settings not saved when OpenTTD crashes [#4846]:
-	With rotated airports, specifically hangars, you will see that the
+        The settings are not saved when OpenTTD crashes for several reasons.
-	aircraft will show a part through the back wall of the hangar.
+        The most important is that the game state is broken and as such the
-	This can be solved by only drawing a part of the plane when being
+        settings might contain invalid values, or the settings have not even
-	at the back of the hangar, however then with transparency turned on
+        been loaded yet. This would cause invalid or totally wrong settings
-	the aircraft would be shown partially which would be even weirder.
+        to be written to the configuration file.
 	As such the current behaviour is deemed the least bad.
 	The same applies to overly long ships and their depots.
-Vehicles not keeping their "maximum" speed [FS#4815]:
+        A solution to that would be saving the settings whenever one changes,
-	Vehicles that have not enough power to reach and maintain their
+        however due to the way the configuration file is saved this requires
-	advertised maximum speed might be constantly jumping between two
+        a flush of the file to the disk and OpenTTD needs to wait till that
-	speeds. This is due to the fact that speed and its calculations
+        is finished. On some file system implementations this causes the
-	are done with integral numbers instead of floating point numbers.
+        flush of all 'write-dirty' caches, which can be a significant amount
-	As a result of this a vehicle will never reach its equilibrium
+        of data to be written. This can further be aggravated by spinning
-	between the drag/friction and propulsion. So in effect it will be
+        down disks to conserve power, in which case this disk needs to be
-	in a vicious circle of speeding up and slowing down due to being
+        spun up first. This means that many seconds may pass before the
-	just at the other side of the equilibrium.
+        configuration file is actually written, and all that time OpenTTD
        will not be able to show any progress. Changing the way the
        configuration file is saved is not an option as that leaves us more
        vulnerable to corrupt configuration files.
-	Not speeding up when near the equilibrium will cause the vehicle
+        Finally, crashes should not be happening. If they happen they should
-	to never come in the neighbourhood of the equilibrium and not
+        be reported and fixed, so essentially fixing this is fixing the wrong
-	slowing down when near the equilibrium will cause the vehicle
+        thing. If you really need the configuration changes to be saved,
-	to never slow down towards the equilibrium once it has come down
+        and you need to run a version that crashes regularly, then you can
-	a hill.
+        use the 'saveconfig' command in the console to save the settings.
-	It is possible to calculate whether the equilibrium will be
+Not all NewGRFs, AIs, game scripts are found [#4887]:
-	passed, but then all acceleration calculations need to be done
+        Under certain situations, where the path for the content within a
-	twice.
+        tar file is the same as other content on the file system or in another
        tar file, it is possible that content is not found. A more thorough
        explanation and solutions are described in section 4.4 of README.md.
-Settings not saved when OpenTTD crashes [FS#4846]:
+Mouse cursor going missing with SDL [#4997]:
-	The settings are not saved when OpenTTD crashes for several reasons.
+        Under certain circumstances SDL does not notify OpenTTD of changes with
-	The most important is that the game state is broken and as such the
+        respect to the mouse pointer, specifically whether the mouse pointer
-	settings might contain invalid values, or the settings have not even
+        is within the bounds of OpenTTD or not. For example, if you "Alt-Tab"
-	been loaded yet. This would cause invalid or totally wrong settings
+        to another application the mouse cursor will still be shown in OpenTTD,
-	to be written to the configuration file.
+        and when you move the mouse outside of the OpenTTD window so the cursor
        gets hidden, open/move another application on top of the OpenTTD window
        and then Alt-tab back into OpenTTD the cursor will not be shown.
-	A solution to that would be saving the settings whenever one changes,
+        We cannot fix this problem as SDL simply does not provide the required
-	however due to the way the configuration file is saved this requires
+        information in these corner cases. This is a bug in SDL and as such
-	a flush of the file to the disk and OpenTTD needs to wait till that
+        there is little that we can do about it.
 	is finished. On some file system implementations this causes the
 	flush of all 'write-dirty' caches, which can be a significant amount
 	of data to be written. This can further be aggravated by spinning
 	down disks to conserve power, in which case this disk needs to be
 	spun up first. This means that many seconds may pass before the
 	configuration file is actually written, and all that time OpenTTD
 	will not be able to show any progress. Changing the way the
 	configuration file is saved is not an option as that leaves us more
 	vulnerable to corrupt configuration files.
-	Finally, crashes should not be happening. If they happen they should
+Trains might not stop at platforms that are currently being changed [#5553]:
-	be reported and fixed, so essentially fixing this is fixing the
+        If you add tiles to or remove tiles from a platform while a train is
-	wrong thing. If you really need the configuration changes to be
+        approaching to stop at the same platform, that train can miss the place
-	saved, and you need to run a version that crashes regularly, then
+        where it's supposed to stop and pass the station without stopping.
-	you can use the 'saveconfig' command in the console to save the
+        This is caused by the fact that the train is considered to already
-	settings.
+        have stopped if it's beyond its assigned stopping location. We can't
        let the train stop just anywhere in the station because then it would
        never leave the station if you have the same station in the order
        list multiple times in a row or if there is only one station
        in theorder list (see #5684).
-Not all NewGRFs, AIs, game scripts are found [FS#4887]:
+Inconsistent catchment areas [#5661]:
-	Under certain situations, where the path for the content within a
+        Due to performance decisions the catchment area for cargo accepted by a
-	tar file is the same as other content on the file system or in another
+        station for delivery to houses or industries differs from the catchment
-	tar file, it is possible that content is not found. A more thorough
+        area for cargo that is delivered to stations from houses or industries.
 	explanation and solutions are described in section 4.4 of readme.txt.
-Mouse cursor going missing with SDL [FS#4997]:
+        Conceptually they work the same, but the effect in game differs. They
-	Under certain circumstances SDL does not notify OpenTTD of changes
+        work by finding the closest destination "around" the source which is
-	with respect to the mouse pointer, specifically whether the mouse
+        within a certain distance. This distance depends on the type of station,
-	pointer is within the bounds of OpenTTD or not. For example, if you
+        e.g. road stops have a smaller catchment area than large airports.
-	Alt-tab to another application the mouse cursor will still be shown
+        In both cases the bounding box, the smallest rectangle that contains
-	in OpenTTD, and when you move the mouse outside of the OpenTTD
+        all tiles of something, is searched for the target of the cargo,
-	window so the cursor gets hidden, open/move another application on
+        and then spiraling outwards finding the closest tile of the target.
 	top of the OpenTTD window and then Alt-tab back into OpenTTD the
 	cursor will not be shown.
-	We cannot fix this problem as SDL simply does not provide the
+        In the case of a station with two tiles spread far apart with a house
-	required information in these corner cases. This is a bug in SDL
+        that is within the station's bounding box, it would be possible that
-	and as such there is little that we can do about it.
+        the spiraling search from the house does not reach one of the station
        tiles before the search ends, i.e. all tiles within that distance
        are searched. So the house does not deliver cargo to the station.
        On the other hand, the station will deliver cargo because the house
        falls within the bounding box, and thus search area.
-Inconsistent catchment areas [FS#5661]:
+        It is possible to make these consistent, but then cargo from a house
-	Due to performance decisions the catchment area for cargo accepted
+        to a station needs to search up to 32 tiles around itself, i.e. 64
-	by a station for delivery to houses or industries differs from the
+        by 64 tiles, to find all possible stations it could deliver to
-	catchment area for cargo that is delivered to stations from houses
+        instead of 10 by 10 tiles (40 times more tiles). Alternatively the
-	or industries.
+        search from a station could be changed to use the actual tiles, but
        that would require considering checking 10 by 10 tiles for each of
        the tiles of a station, instead of just once.
-	Conceptually they work the same, but the effect in game differs.
+Some houses and industries are not affected by transparency [#5817]:
-	They work by finding the closest destination "around" the source
+        Some of the default houses and industries (f.e. the iron ore mine) are
-	which is within a certain distance. This distance depends on the
+        not affected by the transparency options. This is because the graphics
-	type of station, e.g. road stops have a smaller catchment area than
+        do not (completely) separate the ground from the building.
-	large airports. In both cases the bounding box, the smallest
+        This is a bug of the original graphics, and unfortunately cannot be
-	rectangle that contains all tiles of something, is searched for the
+        fixed with OpenGFX for the sake of maintaining compatibility with
-	target of the cargo, and then spiraling outwards finding the closest
+        the original graphics.
 	tile of the target.
-	In the case of a station with two tiles spread far apart with a house
+Involuntary cargo exchange with cargodist via neutral station [#6114]:
-	that is within the station's bounding box, it would be possible that
+        When two players serve a neutral station at an industry, a cross-company
-	the spiraling search from the house does not reach one of the station
+        chain for cargo flow can and will be established which can only be
-	tiles before the search ends, i.e. all tiles within that distance
+        interrupted if one of the players stops competing for the ressources of
-	are searched. So the house does not deliver cargo to the station. On
+        that industry. There is an easy fix for this: If you are loading at the
-	the other hand, the station will deliver cargo because the house
+        shared station make the order "no unload" and if you're unloading make
-	falls within the bounding box, and thus search area.
+        it "no load". Cargodist will then figure out that it should not create
-
+        such a route.
 	It is possible to make these consistent, but then cargo from a house
 	to a station needs to search up to 32 tiles around itself, i.e. 64
 	by 64 tiles, to find all possible stations it could deliver to
 	instead of 10 by 10 tiles (40 times more tiles). Alternatively the
 	search from a station could be changed to use the actual tiles, but
 	that would require considering checking 10 by 10 tiles for each of
 	the tiles of a station, instead of just once.
 Trains might not stop at platforms that are currently being changed [FS#5553]:
 	If you add tiles to or remove tiles from a platform while a train is
 	approaching to stop at the same platform, that train can miss the place
 	where it's supposed to stop and pass the station without stopping. This
 	is caused by the fact that the train is considered to already have stopped
 	if it's beyond its assigned stopping location. We can't let the train stop
 	just anywhere in the station because then it would never leave the station
 	if you have the same station in the order list multiple times in a row or
 	if there is only one station in the order list (see FS#5684).
 Some houses and industries are not affected by transparency [FS#5817]:
 	Some of the default houses and industries (f.e. the iron ore mine) are
 	not affected by the transparency options. This is because the graphics do
 	not (completely) separate the ground from the building.
 	This is a bug of the original graphics, and unfortunately cannot be
 	fixed with OpenGFX for the sake of maintaining compatibility with the
 	original graphics.
 Involuntary cargo exchange with cargodist via neutral station [FS#6114]:
 	When two players serve a neutral station at an industry, a cross-company
 	chain for cargo flow can and will be established which can only be
 	interrupted if one of the players stops competing for the ressources of
 	that industry. There is an easy fix for this: If you are loading at the
 	shared station make the order "no unload" and if you're unloading make
 	it "no load". Cargodist will then figure out that it should not create
 	such a route.
--- a/media/baseset/orig_dos.obm
+++ b/media/baseset/orig_dos.obm
@@ -0,0 +1,76 @@
 ; $Id$
 ;
 ; This represents the original music as on the Transport
 ; Tycoon Deluxe for DOS CD.
 ;
 [metadata]
 name              = original_dos
 shortname         = TTDD
 version           = 1
 !! description STR_BASEMUSIC_DOS_DESCRIPTION
 [files]
 theme = gm.cat
 old_0 = gm.cat
 old_1 = gm.cat
 old_2 = gm.cat
 old_3 = gm.cat
 old_4 = gm.cat
 old_5 = gm.cat
 old_6 = gm.cat
 old_7 = gm.cat
 old_8 =
 old_9 =
 new_0 = gm.cat
 new_1 = gm.cat
 new_2 = gm.cat
 new_3 = gm.cat
 new_4 = gm.cat
 new_5 = gm.cat
 new_6 = gm.cat
 new_7 =
 new_8 =
 new_9 =
 ezy_0 = gm.cat
 ezy_1 = gm.cat
 ezy_2 = gm.cat
 ezy_3 = gm.cat
 ezy_4 = gm.cat
 ezy_5 = gm.cat
 ezy_6 =
 ezy_7 =
 ezy_8 =
 ezy_9 =
 [md5s]
 gm.cat = 7a29d2d0c4f7d2e03091ffa9b2bdfffb
 [catindex]
 theme = 0
 old_0 = 1
 old_1 = 8
 old_2 = 2
 old_3 = 9
 old_4 = 14
 old_5 = 15
 old_6 = 19
 old_7 = 13
 new_0 = 6
 new_1 = 11
 new_2 = 10
 new_3 = 17
 new_4 = 21
 new_5 = 18
 new_6 = 5
 ezy_0 = 12
 ezy_1 = 7
 ezy_2 = 16
 ezy_3 = 3
 ezy_4 = 20
 ezy_5 = 4
 [names]
 ; Names get read from the CAT file
 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
--- a/media/baseset/orig_tto.obm
+++ b/media/baseset/orig_tto.obm
@@ -0,0 +1,71 @@
 ; $Id$
 ;
 ; This represents the original music as on the Transport
 ; Tycoon (with World Editor) for DOS CD.
 ;
 [metadata]
 name              = original_tto
 shortname         = TTOD
 version           = 1
 !! description STR_BASEMUSIC_TTO_DESCRIPTION
 [files]
 theme = gm-tto.cat
 old_0 = gm-tto.cat
 old_1 = gm-tto.cat
 old_2 = gm-tto.cat
 old_3 = gm-tto.cat
 old_4 = gm-tto.cat
 old_5 = gm-tto.cat
 old_6 = gm-tto.cat
 old_7 = gm-tto.cat
 old_8 =
 old_9 =
 new_0 = gm-tto.cat
 new_1 = gm-tto.cat
 new_2 = gm-tto.cat
 new_3 = gm-tto.cat
 new_4 = gm-tto.cat
 new_5 = gm-tto.cat
 new_6 = gm-tto.cat
 new_7 = gm-tto.cat
 new_8 =
 new_9 =
 ezy_0 =
 ezy_1 =
 ezy_2 =
 ezy_3 =
 ezy_4 =
 ezy_5 =
 ezy_6 =
 ezy_7 =
 ezy_8 =
 ezy_9 =
 [catindex]
 theme = 0
 old_0 = 1
 old_1 = 6
 old_2 = 2
 old_3 = 7
 old_4 = 11
 old_5 = 12
 old_6 = 15
 old_7 = 10
 new_0 = 4
 new_1 = 5
 new_2 = 9
 new_3 = 8
 new_4 = 13
 new_5 = 16
 new_6 = 14
 new_7 = 3
 [md5s]
 gm-tto.cat = 26e85ff84b0063aa5da05dd4698fc76e
 [names]
 ; Names get read from the CAT file
 [origin]
 default      = You can find it on your Transport Tycoon CD-ROM.
--- a/media/baseset/orig_win.obm
+++ b/media/baseset/orig_win.obm
@@ -90,5 +90,17 @@ GM_TT19.GM = Funk Central
 GM_TT20.GM = Jammit
 GM_TT21.GM = Movin' On
 ; MIDI timecodes where the playback should attemp to start and stop short.
 ; This is to allow fixing undesired silences in original MIDI files.
 ; However not all music drivers may support this.
 [timingtrim]
 ; Theme has two beats silence at the beginning which prevents clean looping.
 GM_TT00.GM = 768:53760
 ; Can't Get There From Here from the Windows version has a long silence at the end,
 ; followed by a solo repeat. This isn't in the original DOS version music and is likely
 ; unintentional from the people who converted the music from the DOS version.
 ; Actual song ends after measure 152.
 GM_TT10.GM = 0:235008
 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
--- a/media/extra_grf/openttdgui.png
+++ b/media/extra_grf/openttdgui.png
--- a/os/debian/changelog
+++ b/os/debian/changelog
@@ -1,3 +1,15 @@
 openttd (1.8.0-0) unstable; urgency=low
  * New upstream release 1.8.0
 -- OpenTTD <info@openttd.org>  Sun, 01 Apr 2018 14:00:00 +0200
 openttd (1.8.0~RC1-0) unstable; urgency=low
  * New upstream release 1.8.0-RC1
 -- OpenTTD <info@openttd.org>  Wed, 21 Mar 2018 21:00:00 +0100
 openttd (1.7.2-0) unstable; urgency=low
  * New upstream release 1.7.2
@@ -1002,4 +1014,3 @@ openttd (0.3.5-1) unstable; urgency=low
  * Initial Release.
 -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Fri, 24 Dec 2004 02:58:47 +0100
--- a/os/windows/installer/install.nsi
+++ b/os/windows/installer/install.nsi
@@ -304,6 +304,7 @@ Section /o "Copy data from Transport Tycoon Deluxe CD-ROM" Section2
 	; Let's copy the files with size approximation
 	SetOutPath "$INSTDIR\baseset"
 	CopyFiles "$CDDRIVE\gm\*.gm" "$INSTDIR\baseset\" 1028
 	CopyFiles "$CDDRIVE\gm.cat" "$INSTDIR\baseset\gm.cat" 415
 	CopyFiles "$CDDRIVE\sample.cat" "$INSTDIR\baseset\sample.cat" 1566
 	; Copy Windows files
 	CopyFiles "$CDDRIVE\trg1r.grf" "$INSTDIR\baseset\trg1r.grf" 2365
@@ -426,6 +427,8 @@ Section "Uninstall"
 	Delete "$INSTDIR\baseset\trgt.grf"
 	Delete "$INSTDIR\baseset\trgc.grf"
 	Delete "$INSTDIR\baseset\trgi.grf"
 	Delete "$INSTDIR\baseset\gm.cat"
 	Delete "$INSTDIR\baseset\gm-tto.cat"
 	Delete "$INSTDIR\baseset\*.gm"
 	Delete "$INSTDIR\data\sample.cat"
@@ -467,8 +470,10 @@ Section "Uninstall"
 	; Base sets for music
 	Delete "$INSTDIR\gm\orig_win.obm"
 	Delete "$INSTDIR\gm\orig_dos.obm"
 	Delete "$INSTDIR\gm\no_music.obm"
 	Delete "$INSTDIR\baseset\orig_win.obm"
 	Delete "$INSTDIR\baseset\orig_dos.obm"
 	Delete "$INSTDIR\baseset\no_music.obm"
 	; Remove remaining directories
--- a/projects/generate
+++ b/projects/generate
@@ -40,28 +40,6 @@ fi
 # generate_vs140.vcxproj        is for MSVC 2015
 # version_vs140.vcxproj         is for MSVC 2015
 # openttd_vs100.sln             is for MSVC 2010
 # openttd_vs100.vcxproj         is for MSVC 2010
 # openttd_vs100.vcxproj.filters is for MSVC 2010
 # langs_vs100.vcxproj           is for MSVC 2010
 # strgen_vs100.vcxproj          is for MSVC 2010
 # strgen_vs100.vcxproj.filters  is for MSVC 2010
 # generate_vs100.vcxproj        is for MSVC 2010
 # version_vs100.vcxproj         is for MSVC 2010
 # openttd_vs90.sln              is for MSVC 2008
 # openttd_vs90.vcproj           is for MSVC 2008
 # langs_vs90.vcproj             is for MSVC 2008
 # strgen_vs90.vcproj            is for MSVC 2008
 # generate_vs90.vcproj          is for MSVC 2008
 # version_vs90.vcproj           is for MSVC 2008
 # openttd_vs80.sln              is for MSVC 2005
 # openttd_vs80.vcproj           is for MSVC 2005
 # langs_vs80.vcproj             is for MSVC 2005
 # strgen_vs80.vcproj            is for MSVC 2005
 # generate_vs80.vcproj          is for MSVC 2005
 # version_vs80.vcproj           is for MSVC 2005
@@ -74,6 +52,7 @@ enable_dedicated="0"
 enable_ai="1"
 with_cocoa="0"
 enable_directmusic="1"
 enable_fluidsynth="0"
 with_threads="1"
 file_prefix="..\\\\src\\\\"
@@ -123,7 +102,6 @@ load_main_data() {
 			if ($0 == "PNG"         && "'$png_config'" == "")          { next; }
 			if ($0 == "OSX"         && "'$os'" != "OSX")               { next; }
 			if ($0 == "OS2"         && "'$os'" != "OS2")               { next; }
 			if ($0 == "PSP"         && "'$os'" != "PSP")               { next; }
 			if ($0 == "DOS"         && "'$os'" != "DOS")               { next; }
 			if ($0 == "DEDICATED"   && "'$enable_dedicated'" != "1")   { next; }
 			if ($0 == "AI"          && "'$enable_ai'" == "0")          { next; }
@@ -131,9 +109,9 @@ load_main_data() {
 			if ($0 == "BEOS"        && "'$os'" != "BEOS")              { next; }
 			if ($0 == "WIN32"       && "'$os'" != "MINGW" &&
 											"'$os'" != "CYGWIN" && "'$os'" != "MSVC" ) { next; }
 			if ($0 == "WINCE"       && "'$os'" != "WINCE")             { next; }
 			if ($0 == "MSVC"        && "'$os'" != "MSVC")              { next; }
 			if ($0 == "DIRECTMUSIC" && "'$enable_directmusic'" != "1") { next; }
 			if ($0 == "FLUIDSYNTH"  && "'$enable_fluidsynth'" != "1")  { next; }
 			if ($0 == "LIBTIMIDITY" && "'$libtimidity'" == "" )        { next; }
 			if ($0 == "HAVE_THREAD" && "'$with_threads'" == "0")       { next; }
@@ -192,9 +170,11 @@ load_main_data() {
 load_lang_data() {
 	RES=""
-	for i in `ls $1`
+	# Windows Folder sort and Linux Folder sort are slightly different.
 	# By removing the extension and sorting it on Linux, they are the same.
 	for i in `ls $1 | sed s~.txt$~~g | sort`
 	do
-		i=`basename $i | sed s~.txt$~~g`
+		i=`basename $i`
 		if [ "$i" == "english" ]
 		then
 			continue
@@ -320,26 +300,14 @@ settingscommand=`echo "$settings" | grep "^#3" | sed "s~#3~~g"`
 settingsvcxproj=`echo "$settings" | grep "^#2" | sed "s~#2~~g"`
 settings=`echo "$settings" | grep "^#1" | sed "s~#1~~g"`
 generate "$openttd" "openttd_vs80.vcproj"
 generate "$openttd" "openttd_vs90.vcproj"
 generate "$openttdvcxproj" "openttd_vs100.vcxproj"
 generate "$openttdfiles" "openttd_vs100.vcxproj.filters" "$openttdfilters"
 generate "$openttdvcxproj" "openttd_vs140.vcxproj"
 generate "$openttdfiles" "openttd_vs140.vcxproj.filters" "$openttdfilters"
 generate "$openttdvcxproj" "openttd_vs141.vcxproj"
 generate "$openttdfiles" "openttd_vs141.vcxproj.filters" "$openttdfilters"
 generate "$lang" "langs_vs80.vcproj"
 generate "$lang" "langs_vs90.vcproj"
 generate "$langvcxproj" "langs_vs100.vcxproj"
 generate "$langfiles" "langs_vs100.vcxproj.filters"
 generate "$langvcxproj" "langs_vs140.vcxproj"
 generate "$langfiles" "langs_vs140.vcxproj.filters"
 generate "$langvcxproj" "langs_vs141.vcxproj"
 generate "$langfiles" "langs_vs141.vcxproj.filters"
 generate "$settings" "settings_vs80.vcproj" "$settingscommand"
 generate "$settings" "settings_vs90.vcproj" "$settingscommand"
 generate "$settingsvcxproj" "settings_vs100.vcxproj" "$settingscommand"
 generate "$settingsfiles" "settings_vs100.vcxproj.filters"
 generate "$settingsvcxproj" "settings_vs140.vcxproj" "$settingscommand"
 generate "$settingsfiles" "settings_vs140.vcxproj.filters"
 generate "$settingsvcxproj" "settings_vs141.vcxproj" "$settingscommand"
--- a/projects/generate.vbs
+++ b/projects/generate.vbs
@@ -28,29 +28,6 @@ Set FSO = CreateObject("Scripting.FileSystemObject")
 ' generate_vs140.vcxproj        is for MSVC 2015
 ' version_vs140.vcxproj         is for MSVC 2015
 ' openttd_vs100.sln             is for MSVC 2010
 ' openttd_vs100.vcxproj         is for MSVC 2010
 ' openttd_vs100.vcxproj.filters is for MSVC 2010
 ' langs_vs100.vcxproj           is for MSVC 2010
 ' strgen_vs100.vcxproj          is for MSVC 2010
 ' strgen_vs100.vcxproj.filters  is for MSVC 2010
 ' generate_vs100.vcxproj        is for MSVC 2010
 ' version_vs100.vcxproj         is for MSVC 2010
 ' openttd_vs90.sln              is for MSVC 2008
 ' openttd_vs90.vcproj           is for MSVC 2008
 ' langs_vs90.vcproj             is for MSVC 2008
 ' strgen_vs90.vcproj            is for MSVC 2008
 ' generate_vs90.vcproj          is for MSVC 2008
 ' version_vs90.vcproj           is for MSVC 2008
 ' openttd_vs80.sln              is for MSVC 2005
 ' openttd_vs80.vcproj           is for MSVC 2005
 ' langs_vs80.vcproj             is for MSVC 2005
 ' strgen_vs80.vcproj            is for MSVC 2005
 ' generate_vs80.vcproj          is for MSVC 2005
 ' version_vs80.vcproj           is for MSVC 2005
 Sub safety_check(filename)
 	Dim file, line, regexp, list
@@ -383,10 +360,6 @@ headers_check ROOT_DIR & "/source.list", ROOT_DIR & "\src\" ' Backslashes needed
 Dim openttd, openttdvcxproj, openttdfilters, openttdfiles
 openttd = load_main_data(ROOT_DIR & "/source.list", openttdvcxproj, openttdfilters, openttdfiles)
 generate openttd, ROOT_DIR & "/projects/openttd_vs80.vcproj", Null
 generate openttd, ROOT_DIR & "/projects/openttd_vs90.vcproj", Null
 generate openttdvcxproj, ROOT_DIR & "/projects/openttd_vs100.vcxproj", Null
 generate openttdfiles, ROOT_DIR & "/projects/openttd_vs100.vcxproj.filters", openttdfilters
 generate openttdvcxproj, ROOT_DIR & "/projects/openttd_vs140.vcxproj", Null
 generate openttdfiles, ROOT_DIR & "/projects/openttd_vs140.vcxproj.filters", openttdfilters
 generate openttdvcxproj, ROOT_DIR & "/projects/openttd_vs141.vcxproj", Null
@@ -394,10 +367,6 @@ generate openttdfiles, ROOT_DIR & "/projects/openttd_vs141.vcxproj.filters", ope
 Dim lang, langvcxproj, langfiles
 lang = load_lang_data(ROOT_DIR & "/src/lang", langvcxproj, langfiles)
 generate lang, ROOT_DIR & "/projects/langs_vs80.vcproj", Null
 generate lang, ROOT_DIR & "/projects/langs_vs90.vcproj", Null
 generate langvcxproj, ROOT_DIR & "/projects/langs_vs100.vcxproj", Null
 generate langfiles, ROOT_DIR & "/projects/langs_vs100.vcxproj.filters", Null
 generate langvcxproj, ROOT_DIR & "/projects/langs_vs140.vcxproj", Null
 generate langfiles, ROOT_DIR & "/projects/langs_vs140.vcxproj.filters", Null
 generate langvcxproj, ROOT_DIR & "/projects/langs_vs141.vcxproj", Null
@@ -405,10 +374,6 @@ generate langfiles, ROOT_DIR & "/projects/langs_vs141.vcxproj.filters", Null
 Dim settings, settingsvcxproj, settingscommand, settingsfiles
 settings = load_settings_data(ROOT_DIR & "/src/table", settingsvcxproj, settingscommand, settingsfiles)
 generate settings, ROOT_DIR & "/projects/settings_vs80.vcproj", settingscommand
 generate settings, ROOT_DIR & "/projects/settings_vs90.vcproj", settingscommand
 generate settingsvcxproj, ROOT_DIR & "/projects/settings_vs100.vcxproj", settingscommand
 generate settingsfiles, ROOT_DIR & "/projects/settings_vs100.vcxproj.filters", Null
 generate settingsvcxproj, ROOT_DIR & "/projects/settings_vs140.vcxproj", settingscommand
 generate settingsfiles, ROOT_DIR & "/projects/settings_vs140.vcxproj.filters", Null
 generate settingsvcxproj, ROOT_DIR & "/projects/settings_vs141.vcxproj", settingscommand
--- a/projects/generate_vs100.vcxproj
+++ b/projects/generate_vs100.vcxproj
@@ -1,42 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectName>generate</ProjectName>
    <ProjectGuid>{2F31FD79-D1AC-43C4-89F3-B0D5E4E53E34}</ProjectGuid>
    <RootNamespace>generate</RootNamespace>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Utility</ConfigurationType>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup>
    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
  </PropertyGroup>
  <ItemDefinitionGroup>
  </ItemDefinitionGroup>
  <ItemGroup>
    <CustomBuild Include="..\source.list">
      <FileType>Document</FileType>
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Running %27generate.vbs%27 ...</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cscript "$(ProjectDir)generate.vbs"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(FullPath);%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)openttd_vs80.vcproj;$(SolutionDir)openttd_vs90.vcproj;$(SolutionDir)openttd_vs100.vcxproj;$(SolutionDir)openttd_vs100.vcxproj.filters;$(SolutionDir)langs_vs80.vcproj;$(SolutionDir)langs_vs90.vcproj;$(SolutionDir)langs_vs100.vcxproj;%(Outputs)</Outputs>
    </CustomBuild>
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
 </Project>
--- a/projects/generate_vs80.vcproj
+++ b/projects/generate_vs80.vcproj
@@ -1,39 +0,0 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="generate"
 	ProjectGUID="{2F31FD79-D1AC-43C4-89F3-B0D5E4E53E34}"
 	RootNamespace="generate"
 	>
 	<Platforms>
 		<Platform
 			Name="Win32"
 		/>
 	</Platforms>
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
 			IntermediateDirectory="..\objs\generate"
 			ConfigurationType="10"
 			>
 		</Configuration>
 	</Configurations>
 	<Files>
 		<File
 			RelativePath="..\source.list"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
 				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Running 'generate.vbs'..."
 					CommandLine="cscript &quot;$(ProjectDir)generate.vbs&quot;"
 					AdditionalDependencies="$(InputPath)"
 					Outputs="$(SolutionDir)openttd_vs80.vcproj;$(SolutionDir)openttd_vs90.vcproj;$(SolutionDir)openttd_vs100.vcxproj;$(SolutionDir)openttd_vs100.vcxproj.filters;$(SolutionDir)langs_vs80.vcproj;$(SolutionDir)langs_vs90.vcproj;$(SolutionDir)langs_vs100.vcxproj"
 				/>
 			</FileConfiguration>
 		</File>
 	</Files>
 </VisualStudioProject>
--- a/projects/generate_vs90.vcproj
+++ b/projects/generate_vs90.vcproj
@@ -1,40 +0,0 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9.00"
 	Name="generate"
 	ProjectGUID="{2F31FD79-D1AC-43C4-89F3-B0D5E4E53E34}"
 	RootNamespace="generate"
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
 			Name="Win32"
 		/>
 	</Platforms>
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
 			IntermediateDirectory="..\objs\generate"
 			ConfigurationType="10"
 			>
 		</Configuration>
 	</Configurations>
 	<Files>
 		<File
 			RelativePath="..\source.list"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
 				>
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Running 'generate.vbs' ..."
 					CommandLine="cscript &quot;$(ProjectDir)generate.vbs&quot;"
 					AdditionalDependencies="$(InputPath)"
 					Outputs="$(SolutionDir)openttd_vs80.vcproj;$(SolutionDir)openttd_vs90.vcproj;$(SolutionDir)openttd_vs100.vcxproj;$(SolutionDir)openttd_vs100.vcxproj.filters;$(SolutionDir)langs_vs80.vcproj;$(SolutionDir)langs_vs90.vcproj;$(SolutionDir)langs_vs100.vcxproj"
 				/>
 			</FileConfiguration>
 		</File>
 	</Files>
 </VisualStudioProject>
--- a/projects/langs_vs100.vcxproj
+++ b/projects/langs_vs100.vcxproj
@@ -1,390 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectName>langs</ProjectName>
    <ProjectGuid>{0F066B23-18DF-4284-8265-F4A5E7E3B966}</ProjectGuid>
    <RootNamespace>langs</RootNamespace>
    <Keyword>MakeFileProj</Keyword>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Utility</ConfigurationType>
    <UseOfMfc>false</UseOfMfc>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup>
    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\</OutDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\langs\</IntDir>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <PreBuildEvent>
      <Message>Generating strings.h</Message>
      <Command>..\objs\strgen\strgen.exe -s ..\src\lang -d ..\objs\langs\table</Command>
    </PreBuildEvent>
    <Midl>
      <TypeLibraryName>./langs.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
  </ItemDefinitionGroup>
  <ItemGroup>
    <CustomBuild Include="..\src\lang\english.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating english language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\english.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\afrikaans.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating afrikaans language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\afrikaans.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\arabic_egypt.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating arabic_egypt language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\arabic_egypt.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\basque.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating basque language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\basque.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\belarusian.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating belarusian language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\belarusian.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\brazilian_portuguese.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating brazilian_portuguese language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\brazilian_portuguese.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\bulgarian.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating bulgarian language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\bulgarian.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\catalan.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating catalan language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\catalan.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\croatian.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating croatian language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\croatian.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\czech.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating czech language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\czech.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\danish.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating danish language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\danish.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\dutch.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating dutch language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\dutch.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\english_AU.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating english_AU language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\english_AU.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\english_US.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating english_US language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\english_US.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\esperanto.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating esperanto language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\esperanto.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\estonian.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating estonian language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\estonian.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\faroese.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating faroese language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\faroese.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\finnish.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating finnish language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\finnish.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\french.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating french language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\french.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\gaelic.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating gaelic language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\gaelic.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\galician.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating galician language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\galician.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\german.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating german language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\german.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\greek.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating greek language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\greek.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\hebrew.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating hebrew language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\hebrew.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\hungarian.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating hungarian language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\hungarian.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\icelandic.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating icelandic language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\icelandic.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\indonesian.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating indonesian language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\indonesian.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\irish.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating irish language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\irish.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\italian.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating italian language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\italian.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\japanese.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating japanese language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\japanese.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\korean.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating korean language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\korean.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\latin.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating latin language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\latin.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\latvian.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating latvian language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\latvian.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\lithuanian.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating lithuanian language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\lithuanian.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\luxembourgish.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating luxembourgish language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\luxembourgish.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\malay.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating malay language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\malay.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\norwegian_bokmal.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating norwegian_bokmal language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\norwegian_bokmal.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\norwegian_nynorsk.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating norwegian_nynorsk language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\norwegian_nynorsk.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\polish.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating polish language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\polish.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\portuguese.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating portuguese language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\portuguese.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\romanian.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating romanian language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\romanian.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\russian.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating russian language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\russian.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\serbian.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating serbian language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\serbian.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\simplified_chinese.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating simplified_chinese language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\simplified_chinese.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\slovak.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating slovak language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\slovak.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\slovenian.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating slovenian language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\slovenian.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\spanish_MX.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating spanish_MX language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\spanish_MX.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\spanish.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating spanish language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\spanish.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\swedish.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating swedish language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\swedish.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\tamil.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating tamil language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\tamil.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\thai.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating thai language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\thai.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\traditional_chinese.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating traditional_chinese language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\traditional_chinese.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\turkish.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating turkish language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\turkish.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\ukrainian.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating ukrainian language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\ukrainian.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\vietnamese.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating vietnamese language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\vietnamese.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\welsh.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating welsh language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\welsh.lng;%(Outputs)</Outputs>
    </CustomBuild>
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="strgen_vs100.vcxproj">
      <Project>{a133a442-bd0a-4ade-b117-ad7545e4bdd1}</Project>
      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
    </ProjectReference>
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
 </Project>
--- a/projects/langs_vs100.vcxproj.filters
+++ b/projects/langs_vs100.vcxproj.filters
@@ -1,176 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="Translations">
      <UniqueIdentifier>{2a164580-9033-4a01-974b-b21da507efda}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
    <CustomBuild Include="..\src\lang\english.txt" />
    <CustomBuild Include="..\src\lang\afrikaans.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\arabic_egypt.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\basque.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\belarusian.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\brazilian_portuguese.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\bulgarian.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\catalan.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\croatian.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\czech.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\danish.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\dutch.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\english_AU.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\english_US.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\esperanto.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\estonian.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\faroese.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\finnish.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\french.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\gaelic.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\galician.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\german.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\greek.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\hebrew.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\hungarian.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\icelandic.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\indonesian.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\irish.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\italian.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\japanese.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\korean.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\latin.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\latvian.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\lithuanian.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\luxembourgish.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\malay.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\norwegian_bokmal.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\norwegian_nynorsk.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\polish.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\portuguese.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\romanian.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\russian.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\serbian.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\simplified_chinese.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\slovak.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\slovenian.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\spanish_MX.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\spanish.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\swedish.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\tamil.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\thai.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\traditional_chinese.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\turkish.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\ukrainian.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\vietnamese.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\welsh.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
  </ItemGroup>
 </Project>
--- a/projects/langs_vs100.vcxproj.filters.in
+++ b/projects/langs_vs100.vcxproj.filters.in
@@ -1,12 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="Translations">
      <UniqueIdentifier>{2a164580-9033-4a01-974b-b21da507efda}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
    <CustomBuild Include="..\src\lang\english.txt" />
 !!FILES!!
  </ItemGroup>
 </Project>
--- a/projects/langs_vs100.vcxproj.in
+++ b/projects/langs_vs100.vcxproj.in
@@ -1,61 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectName>langs</ProjectName>
    <ProjectGuid>{0F066B23-18DF-4284-8265-F4A5E7E3B966}</ProjectGuid>
    <RootNamespace>langs</RootNamespace>
    <Keyword>MakeFileProj</Keyword>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Utility</ConfigurationType>
    <UseOfMfc>false</UseOfMfc>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup>
    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\</OutDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\langs\</IntDir>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <PreBuildEvent>
      <Message>Generating strings.h</Message>
      <Command>..\objs\strgen\strgen.exe -s ..\src\lang -d ..\objs\langs\table</Command>
    </PreBuildEvent>
    <Midl>
      <TypeLibraryName>./langs.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
  </ItemDefinitionGroup>
  <ItemGroup>
    <CustomBuild Include="..\src\lang\english.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating english language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\english.lng;%(Outputs)</Outputs>
    </CustomBuild>
 !!FILES!!
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="strgen_vs100.vcxproj">
      <Project>{a133a442-bd0a-4ade-b117-ad7545e4bdd1}</Project>
      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
    </ProjectReference>
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
 </Project>
--- a/projects/langs_vs140.vcxproj
+++ b/projects/langs_vs140.vcxproj
@@ -317,18 +317,18 @@
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\slovenian.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\spanish_MX.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating spanish_MX language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\spanish_MX.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\spanish.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating spanish language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\spanish.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\spanish_MX.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating spanish_MX language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\spanish_MX.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\swedish.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating swedish language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
--- a/projects/langs_vs140.vcxproj.filters
+++ b/projects/langs_vs140.vcxproj.filters
@@ -142,10 +142,10 @@
    <CustomBuild Include="..\src\lang\slovenian.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
-    <CustomBuild Include="..\src\lang\spanish_MX.txt">
+    <CustomBuild Include="..\src\lang\spanish.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
-    <CustomBuild Include="..\src\lang\spanish.txt">
+    <CustomBuild Include="..\src\lang\spanish_MX.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\swedish.txt">
--- a/projects/langs_vs141.vcxproj
+++ b/projects/langs_vs141.vcxproj
@@ -317,18 +317,18 @@
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\slovenian.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\spanish_MX.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating spanish_MX language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\spanish_MX.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\spanish.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating spanish language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\spanish.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\spanish_MX.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating spanish_MX language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\lang\spanish_MX.lng;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\swedish.txt">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating swedish language file</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"</Command>
--- a/projects/langs_vs141.vcxproj.filters
+++ b/projects/langs_vs141.vcxproj.filters
@@ -142,10 +142,10 @@
    <CustomBuild Include="..\src\lang\slovenian.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
-    <CustomBuild Include="..\src\lang\spanish_MX.txt">
+    <CustomBuild Include="..\src\lang\spanish.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
-    <CustomBuild Include="..\src\lang\spanish.txt">
+    <CustomBuild Include="..\src\lang\spanish_MX.txt">
      <Filter>Translations</Filter>
    </CustomBuild>
    <CustomBuild Include="..\src\lang\swedish.txt">
--- a/projects/langs_vs80.vcproj
+++ b/projects/langs_vs80.vcproj
@@ -1,895 +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="..\bin\lang"
 			IntermediateDirectory="..\objs\langs"
 			ConfigurationType="10"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="Generating strings.h"
 				CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\objs\langs\table"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
 				Name="VCMIDLTool"
 				TypeLibraryName="./langs.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 	</Configurations>
 	<References>
 	</References>
 	<Files>
 		<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;exit 0&#x0D;&#x0A;"
 					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\english.lng"
 				/>
 			</FileConfiguration>
 		</File>
 		<Filter
 			Name="Translations"
 			>
 			<File
 				RelativePath="..\src\lang\afrikaans.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating afrikaans language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\afrikaans.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\arabic_egypt.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating arabic_egypt language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\arabic_egypt.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\basque.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating basque language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\basque.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\belarusian.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating belarusian language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\belarusian.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;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						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;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						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;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\catalan.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\croatian.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating croatian language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\croatian.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;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						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;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						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;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\dutch.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\english_AU.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating english_AU language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\english_AU.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\english_US.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating english_US language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\english_US.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;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						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;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\estonian.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\faroese.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating faroese language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\faroese.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;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						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;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\french.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\gaelic.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating gaelic language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\gaelic.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;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						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;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\german.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\greek.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating greek language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\greek.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\hebrew.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating hebrew language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\hebrew.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;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						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;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\icelandic.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\indonesian.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating indonesian language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\indonesian.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\irish.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating irish language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\irish.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;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\italian.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\japanese.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating japanese language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\japanese.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\korean.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating korean language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\korean.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\latin.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating latin language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\latin.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\latvian.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating latvian language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\latvian.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\lithuanian.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating lithuanian language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\lithuanian.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\luxembourgish.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating luxembourgish language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\luxembourgish.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\malay.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating malay language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\malay.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\norwegian_bokmal.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating norwegian_bokmal language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\norwegian_bokmal.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\norwegian_nynorsk.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating norwegian_nynorsk language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\norwegian_nynorsk.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;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						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;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						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;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						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;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\russian.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\serbian.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating serbian language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\serbian.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\simplified_chinese.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating simplified_chinese language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\simplified_chinese.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;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\slovak.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\slovenian.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating slovenian language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\slovenian.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\spanish_MX.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating spanish_MX language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\spanish_MX.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;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						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;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\swedish.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\tamil.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating tamil language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\tamil.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\thai.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating thai language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\thai.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\traditional_chinese.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating traditional_chinese language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\traditional_chinese.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;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						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;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\ukrainian.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\vietnamese.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating vietnamese language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\vietnamese.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\welsh.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating welsh language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\welsh.lng"
 					/>
 				</FileConfiguration>
 			</File>
 		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
 </VisualStudioProject>
--- a/projects/langs_vs80.vcproj.in
+++ b/projects/langs_vs80.vcproj.in
@@ -1,71 +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="..\bin\lang"
 			IntermediateDirectory="..\objs\langs"
 			ConfigurationType="10"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="Generating strings.h"
 				CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\objs\langs\table"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
 				Name="VCMIDLTool"
 				TypeLibraryName="./langs.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 	</Configurations>
 	<References>
 	</References>
 	<Files>
 		<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;exit 0&#x0D;&#x0A;"
 					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\english.lng"
 				/>
 			</FileConfiguration>
 		</File>
 		<Filter
 			Name="Translations"
 			>
 !!FILES!!
 		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
 </VisualStudioProject>
--- a/projects/langs_vs90.vcproj
+++ b/projects/langs_vs90.vcproj
@@ -1,896 +0,0 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9.00"
 	Name="langs"
 	ProjectGUID="{0F066B23-18DF-4284-8265-F4A5E7E3B966}"
 	RootNamespace="langs"
 	Keyword="MakeFileProj"
 	TargetFrameworkVersion="131072"
 	>
 	<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="VCPreBuildEventTool"
 				Description="Generating strings.h"
 				CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\objs\langs\table"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
 				Name="VCMIDLTool"
 				TypeLibraryName="./langs.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 	</Configurations>
 	<References>
 	</References>
 	<Files>
 		<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;exit 0&#x0D;&#x0A;"
 					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\english.lng"
 				/>
 			</FileConfiguration>
 		</File>
 		<Filter
 			Name="Translations"
 			>
 			<File
 				RelativePath="..\src\lang\afrikaans.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating afrikaans language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\afrikaans.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\arabic_egypt.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating arabic_egypt language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\arabic_egypt.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\basque.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating basque language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\basque.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\belarusian.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating belarusian language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\belarusian.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;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						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;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						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;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\catalan.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\croatian.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating croatian language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\croatian.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;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						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;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						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;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\dutch.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\english_AU.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating english_AU language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\english_AU.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\english_US.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating english_US language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\english_US.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;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						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;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\estonian.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\faroese.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating faroese language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\faroese.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;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						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;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\french.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\gaelic.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating gaelic language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\gaelic.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;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						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;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\german.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\greek.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating greek language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\greek.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\hebrew.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating hebrew language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\hebrew.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;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						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;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\icelandic.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\indonesian.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating indonesian language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\indonesian.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\irish.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating irish language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\irish.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;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\italian.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\japanese.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating japanese language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\japanese.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\korean.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating korean language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\korean.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\latin.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating latin language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\latin.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\latvian.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating latvian language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\latvian.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\lithuanian.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating lithuanian language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\lithuanian.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\luxembourgish.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating luxembourgish language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\luxembourgish.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\malay.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating malay language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\malay.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\norwegian_bokmal.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating norwegian_bokmal language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\norwegian_bokmal.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\norwegian_nynorsk.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating norwegian_nynorsk language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\norwegian_nynorsk.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;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						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;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						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;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						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;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\russian.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\serbian.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating serbian language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\serbian.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\simplified_chinese.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating simplified_chinese language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\simplified_chinese.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;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\slovak.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\slovenian.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating slovenian language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\slovenian.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\spanish_MX.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating spanish_MX language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\spanish_MX.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;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						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;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\swedish.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\tamil.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating tamil language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\tamil.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\thai.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating thai language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\thai.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\traditional_chinese.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating traditional_chinese language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\traditional_chinese.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;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						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;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\ukrainian.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\vietnamese.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating vietnamese language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\vietnamese.lng"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\lang\welsh.txt"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating welsh language file"
 						CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
 						AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 						Outputs="..\bin\lang\welsh.lng"
 					/>
 				</FileConfiguration>
 			</File>
 		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
 </VisualStudioProject>
--- a/projects/langs_vs90.vcproj.in
+++ b/projects/langs_vs90.vcproj.in
@@ -1,72 +0,0 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9.00"
 	Name="langs"
 	ProjectGUID="{0F066B23-18DF-4284-8265-F4A5E7E3B966}"
 	RootNamespace="langs"
 	Keyword="MakeFileProj"
 	TargetFrameworkVersion="131072"
 	>
 	<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="VCPreBuildEventTool"
 				Description="Generating strings.h"
 				CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\objs\langs\table"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
 				Name="VCMIDLTool"
 				TypeLibraryName="./langs.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 	</Configurations>
 	<References>
 	</References>
 	<Files>
 		<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;exit 0&#x0D;&#x0A;"
 					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
 					Outputs="..\bin\lang\english.lng"
 				/>
 			</FileConfiguration>
 		</File>
 		<Filter
 			Name="Translations"
 			>
 !!FILES!!
 		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
 </VisualStudioProject>
--- a/projects/openttd_vs100.sln
+++ b/projects/openttd_vs100.sln
@@ -1,91 +0,0 @@
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual C++ Express 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openttd", "openttd_vs100.vcxproj", "{668328A0-B40E-4CDB-BD72-D0064424414A}"
 	ProjectSection(ProjectDependencies) = postProject
 		{0817F629-589E-4A3B-B81A-8647BC571E35} = {0817F629-589E-4A3B-B81A-8647BC571E35}
 		{E9548DE9-F089-49B7-93A6-30BE2CC311C7} = {E9548DE9-F089-49B7-93A6-30BE2CC311C7}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "strgen", "strgen_vs100.vcxproj", "{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "langs", "langs_vs100.vcxproj", "{0F066B23-18DF-4284-8265-F4A5E7E3B966}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "version", "version_vs100.vcxproj", "{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "generate", "generate_vs100.vcxproj", "{2F31FD79-D1AC-43C4-89F3-B0D5E4E53E34}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "settings", "settings_vs100.vcxproj", "{0817F629-589E-4A3B-B81A-8647BC571E35}"
 	ProjectSection(ProjectDependencies) = postProject
 		{E9548DE9-F089-49B7-93A6-30BE2CC311C7} = {E9548DE9-F089-49B7-93A6-30BE2CC311C7}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "settingsgen", "settingsgen_vs100.vcxproj", "{E9548DE9-F089-49B7-93A6-30BE2CC311C7}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
 		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{668328A0-B40E-4CDB-BD72-D0064424414A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{668328A0-B40E-4CDB-BD72-D0064424414A}.Debug|Win32.Build.0 = Debug|Win32
 		{668328A0-B40E-4CDB-BD72-D0064424414A}.Debug|x64.ActiveCfg = Debug|x64
 		{668328A0-B40E-4CDB-BD72-D0064424414A}.Debug|x64.Build.0 = Debug|x64
 		{668328A0-B40E-4CDB-BD72-D0064424414A}.Release|Win32.ActiveCfg = Release|Win32
 		{668328A0-B40E-4CDB-BD72-D0064424414A}.Release|Win32.Build.0 = Release|Win32
 		{668328A0-B40E-4CDB-BD72-D0064424414A}.Release|x64.ActiveCfg = Release|x64
 		{668328A0-B40E-4CDB-BD72-D0064424414A}.Release|x64.Build.0 = Release|x64
 		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug|Win32.ActiveCfg = Debug|Win32
 		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug|Win32.Build.0 = Debug|Win32
 		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug|x64.ActiveCfg = Debug|Win32
 		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug|x64.Build.0 = Debug|Win32
 		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release|Win32.ActiveCfg = Debug|Win32
 		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release|Win32.Build.0 = Debug|Win32
 		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release|x64.ActiveCfg = Debug|Win32
 		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release|x64.Build.0 = Debug|Win32
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Debug|Win32.ActiveCfg = Debug|Win32
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Debug|Win32.Build.0 = Debug|Win32
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Debug|x64.ActiveCfg = Debug|Win32
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Debug|x64.Build.0 = Debug|Win32
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release|Win32.ActiveCfg = Debug|Win32
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release|Win32.Build.0 = Debug|Win32
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release|x64.ActiveCfg = Debug|Win32
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release|x64.Build.0 = Debug|Win32
 		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Debug|Win32.ActiveCfg = Debug|Win32
 		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Debug|Win32.Build.0 = Debug|Win32
 		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Debug|x64.ActiveCfg = Debug|Win32
 		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Debug|x64.Build.0 = Debug|Win32
 		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Release|Win32.ActiveCfg = Debug|Win32
 		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Release|Win32.Build.0 = Debug|Win32
 		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Release|x64.ActiveCfg = Debug|Win32
 		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Release|x64.Build.0 = Debug|Win32
 		{2F31FD79-D1AC-43C4-89F3-B0D5E4E53E34}.Debug|Win32.ActiveCfg = Debug|Win32
 		{2F31FD79-D1AC-43C4-89F3-B0D5E4E53E34}.Debug|x64.ActiveCfg = Debug|Win32
 		{2F31FD79-D1AC-43C4-89F3-B0D5E4E53E34}.Release|Win32.ActiveCfg = Debug|Win32
 		{2F31FD79-D1AC-43C4-89F3-B0D5E4E53E34}.Release|x64.ActiveCfg = Debug|Win32
 		{0817F629-589E-4A3B-B81A-8647BC571E35}.Debug|Win32.ActiveCfg = Debug|Win32
 		{0817F629-589E-4A3B-B81A-8647BC571E35}.Debug|Win32.Build.0 = Debug|Win32
 		{0817F629-589E-4A3B-B81A-8647BC571E35}.Debug|x64.ActiveCfg = Debug|Win32
 		{0817F629-589E-4A3B-B81A-8647BC571E35}.Debug|x64.Build.0 = Debug|Win32
 		{0817F629-589E-4A3B-B81A-8647BC571E35}.Release|Win32.ActiveCfg = Debug|Win32
 		{0817F629-589E-4A3B-B81A-8647BC571E35}.Release|Win32.Build.0 = Debug|Win32
 		{0817F629-589E-4A3B-B81A-8647BC571E35}.Release|x64.ActiveCfg = Debug|Win32
 		{0817F629-589E-4A3B-B81A-8647BC571E35}.Release|x64.Build.0 = Debug|Win32
 		{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Debug|Win32.ActiveCfg = Debug|Win32
 		{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Debug|Win32.Build.0 = Debug|Win32
 		{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Debug|x64.ActiveCfg = Debug|Win32
 		{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Debug|x64.Build.0 = Debug|Win32
 		{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Release|Win32.ActiveCfg = Debug|Win32
 		{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Release|Win32.Build.0 = Debug|Win32
 		{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Release|x64.ActiveCfg = Debug|Win32
 		{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Release|x64.Build.0 = Debug|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(DPCodeReviewSolutionGUID) = preSolution
 		DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
 	EndGlobalSection
 EndGlobal
--- a/projects/openttd_vs100.vcxproj.filters.in
+++ b/projects/openttd_vs100.vcxproj.filters.in
@@ -1,13 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
 !!FILTERS!!
  </ItemGroup>
  <ItemGroup>
 !!FILES!!
  </ItemGroup>
  <ItemGroup>
    <None Include="..\media\openttd.ico" />
    <None Include="..\README.md" />
  </ItemGroup>
 </Project>
--- a/projects/openttd_vs100.vcxproj.in
+++ b/projects/openttd_vs100.vcxproj.in
@@ -1,339 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
    <ProjectConfiguration Include="Debug|x64">
      <Configuration>Debug</Configuration>
      <Platform>x64</Platform>
    </ProjectConfiguration>
    <ProjectConfiguration Include="Release|Win32">
      <Configuration>Release</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
    <ProjectConfiguration Include="Release|x64">
      <Configuration>Release</Configuration>
      <Platform>x64</Platform>
    </ProjectConfiguration>
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectName>openttd</ProjectName>
    <ProjectGuid>{668328A0-B40E-4CDB-BD72-D0064424414A}</ProjectGuid>
    <RootNamespace>openttd</RootNamespace>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseOfMfc>false</UseOfMfc>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseOfMfc>false</UseOfMfc>
    <CharacterSet>Unicode</CharacterSet>
    <WholeProgramOptimization>true</WholeProgramOptimization>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseOfMfc>false</UseOfMfc>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseOfMfc>false</UseOfMfc>
    <CharacterSet>Unicode</CharacterSet>
    <WholeProgramOptimization>true</WholeProgramOptimization>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup>
    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\objs\$(Platform)\$(Configuration)\</OutDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\objs\$(Platform)\$(Configuration)\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\objs\$(Platform)\$(Configuration)\</OutDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\objs\$(Platform)\$(Configuration)\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\objs\$(Platform)\$(Configuration)\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\objs\$(Platform)\$(Configuration)\</OutDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\objs\$(Platform)\$(Configuration)\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\objs\$(Platform)\$(Configuration)\</OutDir>
    <LocalDebuggerWorkingDirectory>$(ProjectDir)..\bin</LocalDebuggerWorkingDirectory>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <Midl>
      <TypeLibraryName>.\Release/openttd.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <AdditionalOptions>/MP /J %(AdditionalOptions)</AdditionalOptions>
      <Optimization>Full</Optimization>
      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
      <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <ExceptionHandling>Sync</ExceptionHandling>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <StructMemberAlignment>4Bytes</StructMemberAlignment>
      <BufferSecurityCheck>false</BufferSecurityCheck>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <PrecompiledHeader>
      </PrecompiledHeader>
      <PrecompiledHeaderFile>
      </PrecompiledHeaderFile>
      <PrecompiledHeaderOutputFile>
      </PrecompiledHeaderOutputFile>
      <AssemblerOutput>All</AssemblerOutput>
      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
      <ObjectFileName>$(IntDir)</ObjectFileName>
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <TreatWarningAsError>false</TreatWarningAsError>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <CallingConvention>FastCall</CallingConvention>
      <CompileAs>Default</CompileAs>
    </ClCompile>
    <ResourceCompile>
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Culture>0x0809</Culture>
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;icule.lib;iculx.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <SubSystem>Windows</SubSystem>
      <StackReserveSize>1048576</StackReserveSize>
      <StackCommitSize>1048576</StackCommitSize>
      <OptimizeReferences>true</OptimizeReferences>
      <RandomizedBaseAddress>false</RandomizedBaseAddress>
      <DataExecutionPrevention>
      </DataExecutionPrevention>
      <TargetMachine>MachineX86</TargetMachine>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    </Link>
    <Manifest>
      <AdditionalManifestFiles>dpi_aware.manifest;os_versions.manifest</AdditionalManifestFiles>
    </Manifest>
    <PostBuildEvent>
      <Command>copy "$(OutDir)$(TargetName)$(TargetExt)" "$(SolutionDir)..\bin\$(TargetName)$(TargetExt)"</Command>
    </PostBuildEvent>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <Midl>
      <TypeLibraryName>.\Debug/openttd.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <PrecompiledHeader>
      </PrecompiledHeader>
      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
      <ObjectFileName>$(IntDir)</ObjectFileName>
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <TreatWarningAsError>false</TreatWarningAsError>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
      <CallingConvention>FastCall</CallingConvention>
      <CompileAs>Default</CompileAs>
    </ClCompile>
    <ResourceCompile>
      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Culture>0x0809</Culture>
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;icule.lib;iculx.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <IgnoreSpecificDefaultLibraries>LIBCMT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <SubSystem>Windows</SubSystem>
      <StackReserveSize>1048576</StackReserveSize>
      <StackCommitSize>1048576</StackCommitSize>
      <RandomizedBaseAddress>false</RandomizedBaseAddress>
      <DataExecutionPrevention>
      </DataExecutionPrevention>
      <TargetMachine>MachineX86</TargetMachine>
    </Link>
    <Manifest>
      <AdditionalManifestFiles>dpi_aware.manifest;os_versions.manifest</AdditionalManifestFiles>
    </Manifest>
    <PostBuildEvent>
      <Command>copy "$(OutDir)$(TargetName)$(TargetExt)" "$(SolutionDir)..\bin\$(TargetName)$(TargetExt)"</Command>
    </PostBuildEvent>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <Midl>
      <TargetEnvironment>X64</TargetEnvironment>
      <TypeLibraryName>.\Release/openttd.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <AdditionalOptions>/MP /J %(AdditionalOptions)</AdditionalOptions>
      <Optimization>Full</Optimization>
      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
      <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <ExceptionHandling>Sync</ExceptionHandling>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <StructMemberAlignment>Default</StructMemberAlignment>
      <BufferSecurityCheck>false</BufferSecurityCheck>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <PrecompiledHeader>
      </PrecompiledHeader>
      <PrecompiledHeaderFile>
      </PrecompiledHeaderFile>
      <PrecompiledHeaderOutputFile>
      </PrecompiledHeaderOutputFile>
      <AssemblerOutput>All</AssemblerOutput>
      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
      <ObjectFileName>$(IntDir)</ObjectFileName>
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <TreatWarningAsError>false</TreatWarningAsError>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <CallingConvention>FastCall</CallingConvention>
      <CompileAs>Default</CompileAs>
    </ClCompile>
    <ResourceCompile>
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Culture>0x0809</Culture>
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;icule.lib;iculx.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <SubSystem>Windows</SubSystem>
      <StackReserveSize>1048576</StackReserveSize>
      <StackCommitSize>1048576</StackCommitSize>
      <OptimizeReferences>true</OptimizeReferences>
      <TargetMachine>MachineX64</TargetMachine>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    </Link>
    <Manifest>
      <AdditionalManifestFiles>dpi_aware.manifest;os_versions.manifest</AdditionalManifestFiles>
    </Manifest>
    <PostBuildEvent>
      <Command>copy "$(OutDir)$(TargetName)$(TargetExt)" "$(SolutionDir)..\bin\$(TargetName)$(TargetExt)"</Command>
    </PostBuildEvent>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <Midl>
      <TargetEnvironment>X64</TargetEnvironment>
      <TypeLibraryName>.\Debug/openttd.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <PrecompiledHeader>
      </PrecompiledHeader>
      <PrecompiledHeaderFile>
      </PrecompiledHeaderFile>
      <PrecompiledHeaderOutputFile>
      </PrecompiledHeaderOutputFile>
      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
      <ObjectFileName>$(IntDir)</ObjectFileName>
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <TreatWarningAsError>false</TreatWarningAsError>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <CallingConvention>Cdecl</CallingConvention>
      <CompileAs>Default</CompileAs>
    </ClCompile>
    <ResourceCompile>
      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Culture>0x0809</Culture>
    </ResourceCompile>
    <Link>
      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;icule.lib;iculx.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <IgnoreSpecificDefaultLibraries>LIBCMT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <SubSystem>Windows</SubSystem>
      <StackReserveSize>1048576</StackReserveSize>
      <StackCommitSize>1048576</StackCommitSize>
      <TargetMachine>MachineX64</TargetMachine>
    </Link>
    <Manifest>
      <AdditionalManifestFiles>dpi_aware.manifest;os_versions.manifest</AdditionalManifestFiles>
    </Manifest>
    <PostBuildEvent>
      <Command>copy "$(OutDir)$(TargetName)$(TargetExt)" "$(SolutionDir)..\bin\$(TargetName)$(TargetExt)"</Command>
    </PostBuildEvent>
  </ItemDefinitionGroup>
  <ItemGroup>
 !!FILES!!
  </ItemGroup>
  <ItemGroup>
    <None Include="..\media\openttd.ico" />
    <None Include="..\README.md" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="langs_vs100.vcxproj">
      <Project>{0f066b23-18df-4284-8265-f4a5e7e3b966}</Project>
      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
    </ProjectReference>
    <ProjectReference Include="strgen_vs100.vcxproj">
      <Project>{a133a442-bd0a-4ade-b117-ad7545e4bdd1}</Project>
      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
    </ProjectReference>
    <ProjectReference Include="version_vs100.vcxproj">
      <Project>{1a2b3c5e-1c23-41a5-9c9b-acba2aa75fec}</Project>
      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
    </ProjectReference>
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>
--- a/projects/openttd_vs140.sln
+++ b/projects/openttd_vs140.sln
@@ -24,6 +24,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "settings", "settings_vs140.
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "settingsgen", "settingsgen_vs140.vcxproj", "{E9548DE9-F089-49B7-93A6-30BE2CC311C7}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "regression", "regression_vs140.vcxproj", "{4712B013-437D-42CE-947F-DEBABA15261F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -84,6 +86,10 @@ Global
 		{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Release|Win32.Build.0 = Debug|Win32
 		{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Release|x64.ActiveCfg = Debug|Win32
 		{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Release|x64.Build.0 = Debug|Win32
 		{4712B013-437D-42CE-947F-DEBABA15261F}.Debug|Win32.ActiveCfg = Debug|Win32
 		{4712B013-437D-42CE-947F-DEBABA15261F}.Debug|x64.ActiveCfg = Debug|Win32
 		{4712B013-437D-42CE-947F-DEBABA15261F}.Release|Win32.ActiveCfg = Debug|Win32
 		{4712B013-437D-42CE-947F-DEBABA15261F}.Release|x64.ActiveCfg = Debug|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/projects/openttd_vs140.vcxproj
+++ b/projects/openttd_vs140.vcxproj
@@ -22,6 +22,8 @@
    <ProjectName>openttd</ProjectName>
    <ProjectGuid>{668328A0-B40E-4CDB-BD72-D0064424414A}</ProjectGuid>
    <RootNamespace>openttd</RootNamespace>
    <VcpkgTriplet Condition="'$(Platform)'=='Win32'">x86-windows-static</VcpkgTriplet>
    <VcpkgTriplet Condition="'$(Platform)'=='x64'">x64-windows-static</VcpkgTriplet>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -105,7 +107,7 @@
      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
      <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_XAUDIO2;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;WITH_PNG;WITH_FREETYPE;WITH_UNISCRIBE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <ExceptionHandling>Sync</ExceptionHandling>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -136,7 +138,7 @@
      <Culture>0x0809</Culture>
    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;icule.lib;iculx.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -170,7 +172,7 @@
      <Optimization>Disabled</Optimization>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_XAUDIO2;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;WITH_PNG;WITH_FREETYPE;WITH_UNISCRIBE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <PrecompiledHeader>
@@ -192,7 +194,7 @@
      <Culture>0x0809</Culture>
    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;icule.lib;iculx.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <IgnoreSpecificDefaultLibraries>LIBCMT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -228,7 +230,7 @@
      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
      <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_XAUDIO2;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;WITH_PNG;WITH_FREETYPE;WITH_UNISCRIBE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <ExceptionHandling>Sync</ExceptionHandling>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -259,7 +261,7 @@
      <Culture>0x0809</Culture>
    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;icule.lib;iculx.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -291,7 +293,7 @@
      <Optimization>Disabled</Optimization>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_XAUDIO2;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;WITH_PNG;WITH_FREETYPE;WITH_UNISCRIBE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <PrecompiledHeader>
@@ -317,7 +319,7 @@
      <Culture>0x0809</Culture>
    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;icule.lib;iculx.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <IgnoreSpecificDefaultLibraries>LIBCMT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -502,6 +504,7 @@
    <ClInclude Include="..\src\fios.h" />
    <ClInclude Include="..\src\fontcache.h" />
    <ClInclude Include="..\src\fontdetection.h" />
    <ClInclude Include="..\src\framerate_type.h" />
    <ClInclude Include="..\src\base_consist.h" />
    <ClInclude Include="..\src\gamelog.h" />
    <ClInclude Include="..\src\gamelog_internal.h" />
@@ -590,6 +593,8 @@
    <ClInclude Include="..\src\news_func.h" />
    <ClInclude Include="..\src\news_gui.h" />
    <ClInclude Include="..\src\news_type.h" />
    <ClInclude Include="..\src\music\midi.h" />
    <ClInclude Include="..\src\music\midifile.hpp" />
    <ClInclude Include="..\src\music\null_m.h" />
    <ClInclude Include="..\src\sound\null_s.h" />
    <ClInclude Include="..\src\video\null_v.h" />
@@ -651,6 +656,7 @@
    <ClInclude Include="..\src\string_base.h" />
    <ClInclude Include="..\src\string_func.h" />
    <ClInclude Include="..\src\string_type.h" />
    <ClInclude Include="..\src\os\windows\string_uniscribe.h" />
    <ClInclude Include="..\src\stringfilter_type.h" />
    <ClInclude Include="..\src\strings_func.h" />
    <ClInclude Include="..\src\strings_type.h" />
@@ -704,6 +710,7 @@
    <ClInclude Include="..\src\window_func.h" />
    <ClInclude Include="..\src\window_gui.h" />
    <ClInclude Include="..\src\window_type.h" />
    <ClInclude Include="..\src\sound\xaudio2_s.h" />
    <ClInclude Include="..\src\zoom_func.h" />
    <ClInclude Include="..\src\zoom_type.h" />
    <ClCompile Include="..\src\core\alloc_func.cpp" />
@@ -751,6 +758,7 @@
    <ClCompile Include="..\src\engine_gui.cpp" />
    <ClCompile Include="..\src\error_gui.cpp" />
    <ClCompile Include="..\src\fios_gui.cpp" />
    <ClCompile Include="..\src\framerate_gui.cpp" />
    <ClCompile Include="..\src\genworld_gui.cpp" />
    <ClCompile Include="..\src\goal_gui.cpp" />
    <ClCompile Include="..\src\graph_gui.cpp" />
@@ -812,6 +820,7 @@
    <ClInclude Include="..\src\widgets\engine_widget.h" />
    <ClInclude Include="..\src\widgets\error_widget.h" />
    <ClInclude Include="..\src\widgets\fios_widget.h" />
    <ClInclude Include="..\src\widgets\framerate_widget.h" />
    <ClInclude Include="..\src\widgets\genworld_widget.h" />
    <ClInclude Include="..\src\widgets\goal_widget.h" />
    <ClInclude Include="..\src\widgets\graph_widget.h" />
@@ -1170,6 +1179,8 @@
    <ClCompile Include="..\src\script\api\script_window.cpp" />
    <ClCompile Include="..\src\blitter\32bpp_anim.cpp" />
    <ClInclude Include="..\src\blitter\32bpp_anim.hpp" />
    <ClCompile Include="..\src\blitter\32bpp_anim_sse2.cpp" />
    <ClInclude Include="..\src\blitter\32bpp_anim_sse2.hpp" />
    <ClCompile Include="..\src\blitter\32bpp_anim_sse4.cpp" />
    <ClInclude Include="..\src\blitter\32bpp_anim_sse4.hpp" />
    <ClCompile Include="..\src\blitter\32bpp_base.cpp" />
@@ -1314,12 +1325,15 @@
    <ClCompile Include="..\src\video\win32_v.cpp" />
    <ClCompile Include="..\src\music\dmusic.cpp" />
    <ClCompile Include="..\src\music\null_m.cpp" />
    <ClCompile Include="..\src\music\midifile.cpp" />
    <ClCompile Include="..\src\music\win32_m.cpp" />
    <ClCompile Include="..\src\sound\null_s.cpp" />
    <ClCompile Include="..\src\sound\sdl_s.cpp" />
    <ClCompile Include="..\src\sound\win32_s.cpp" />
    <ClCompile Include="..\src\sound\xaudio2_s.cpp" />
    <ClCompile Include="..\src\os\windows\crashlog_win.cpp" />
    <ResourceCompile Include="..\src\os\windows\ottdres.rc" />
    <ClCompile Include="..\src\os\windows\string_uniscribe.cpp" />
    <ClCompile Include="..\src\os\windows\win32.cpp" />
    <ClInclude Include="..\src\thread\thread.h" />
    <ClCompile Include="..\src\thread\thread_win32.cpp" />
--- a/projects/openttd_vs140.vcxproj.filters
+++ b/projects/openttd_vs140.vcxproj.filters
@@ -600,6 +600,9 @@
    <ClInclude Include="..\src\fontdetection.h">
      <Filter>Header Files</Filter>
    </ClInclude>
    <ClInclude Include="..\src\framerate_type.h">
      <Filter>Header Files</Filter>
    </ClInclude>
    <ClInclude Include="..\src\base_consist.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -864,6 +867,12 @@
    <ClInclude Include="..\src\news_type.h">
      <Filter>Header Files</Filter>
    </ClInclude>
    <ClInclude Include="..\src\music\midi.h">
      <Filter>Header Files</Filter>
    </ClInclude>
    <ClInclude Include="..\src\music\midifile.hpp">
      <Filter>Header Files</Filter>
    </ClInclude>
    <ClInclude Include="..\src\music\null_m.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -1047,6 +1056,9 @@
    <ClInclude Include="..\src\string_type.h">
      <Filter>Header Files</Filter>
    </ClInclude>
    <ClInclude Include="..\src\os\windows\string_uniscribe.h">
      <Filter>Header Files</Filter>
    </ClInclude>
    <ClInclude Include="..\src\stringfilter_type.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -1206,6 +1218,9 @@
    <ClInclude Include="..\src\window_type.h">
      <Filter>Header Files</Filter>
    </ClInclude>
    <ClInclude Include="..\src\sound\xaudio2_s.h">
      <Filter>Header Files</Filter>
    </ClInclude>
    <ClInclude Include="..\src\zoom_func.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -1347,6 +1362,9 @@
    <ClCompile Include="..\src\fios_gui.cpp">
      <Filter>GUI Source Code</Filter>
    </ClCompile>
    <ClCompile Include="..\src\framerate_gui.cpp">
      <Filter>GUI Source Code</Filter>
    </ClCompile>
    <ClCompile Include="..\src\genworld_gui.cpp">
      <Filter>GUI Source Code</Filter>
    </ClCompile>
@@ -1530,6 +1548,9 @@
    <ClInclude Include="..\src\widgets\fios_widget.h">
      <Filter>Widgets</Filter>
    </ClInclude>
    <ClInclude Include="..\src\widgets\framerate_widget.h">
      <Filter>Widgets</Filter>
    </ClInclude>
    <ClInclude Include="..\src\widgets\genworld_widget.h">
      <Filter>Widgets</Filter>
    </ClInclude>
@@ -2604,6 +2625,12 @@
    <ClInclude Include="..\src\blitter\32bpp_anim.hpp">
      <Filter>Blitters</Filter>
    </ClInclude>
    <ClCompile Include="..\src\blitter\32bpp_anim_sse2.cpp">
      <Filter>Blitters</Filter>
    </ClCompile>
    <ClInclude Include="..\src\blitter\32bpp_anim_sse2.hpp">
      <Filter>Blitters</Filter>
    </ClInclude>
    <ClCompile Include="..\src\blitter\32bpp_anim_sse4.cpp">
      <Filter>Blitters</Filter>
    </ClCompile>
@@ -3036,6 +3063,9 @@
    <ClCompile Include="..\src\music\null_m.cpp">
      <Filter>Music</Filter>
    </ClCompile>
    <ClCompile Include="..\src\music\midifile.cpp">
      <Filter>Music</Filter>
    </ClCompile>
    <ClCompile Include="..\src\music\win32_m.cpp">
      <Filter>Music</Filter>
    </ClCompile>
@@ -3048,12 +3078,18 @@
    <ClCompile Include="..\src\sound\win32_s.cpp">
      <Filter>Sound</Filter>
    </ClCompile>
    <ClCompile Include="..\src\sound\xaudio2_s.cpp">
      <Filter>Sound</Filter>
    </ClCompile>
    <ClCompile Include="..\src\os\windows\crashlog_win.cpp">
      <Filter>Windows files</Filter>
    </ClCompile>
    <ResourceCompile Include="..\src\os\windows\ottdres.rc">
      <Filter>Windows files</Filter>
    </ResourceCompile>
    <ClCompile Include="..\src\os\windows\string_uniscribe.cpp">
      <Filter>Windows files</Filter>
    </ClCompile>
    <ClCompile Include="..\src\os\windows\win32.cpp">
      <Filter>Windows files</Filter>
    </ClCompile>
--- a/projects/openttd_vs140.vcxproj.in
+++ b/projects/openttd_vs140.vcxproj.in
@@ -22,6 +22,8 @@
    <ProjectName>openttd</ProjectName>
    <ProjectGuid>{668328A0-B40E-4CDB-BD72-D0064424414A}</ProjectGuid>
    <RootNamespace>openttd</RootNamespace>
    <VcpkgTriplet Condition="'$(Platform)'=='Win32'">x86-windows-static</VcpkgTriplet>
    <VcpkgTriplet Condition="'$(Platform)'=='x64'">x64-windows-static</VcpkgTriplet>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -105,7 +107,7 @@
      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
      <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_XAUDIO2;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;WITH_PNG;WITH_FREETYPE;WITH_UNISCRIBE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <ExceptionHandling>Sync</ExceptionHandling>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -136,7 +138,7 @@
      <Culture>0x0809</Culture>
    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;icule.lib;iculx.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -170,7 +172,7 @@
      <Optimization>Disabled</Optimization>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_XAUDIO2;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;WITH_PNG;WITH_FREETYPE;WITH_UNISCRIBE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <PrecompiledHeader>
@@ -192,7 +194,7 @@
      <Culture>0x0809</Culture>
    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;icule.lib;iculx.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <IgnoreSpecificDefaultLibraries>LIBCMT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -228,7 +230,7 @@
      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
      <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_XAUDIO2;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;WITH_PNG;WITH_FREETYPE;WITH_UNISCRIBE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <ExceptionHandling>Sync</ExceptionHandling>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -259,7 +261,7 @@
      <Culture>0x0809</Culture>
    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;icule.lib;iculx.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -291,7 +293,7 @@
      <Optimization>Disabled</Optimization>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_XAUDIO2;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;WITH_PNG;WITH_FREETYPE;WITH_UNISCRIBE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <PrecompiledHeader>
@@ -317,7 +319,7 @@
      <Culture>0x0809</Culture>
    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;icule.lib;iculx.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <IgnoreSpecificDefaultLibraries>LIBCMT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
      <GenerateDebugInformation>true</GenerateDebugInformation>
--- a/projects/openttd_vs141.sln
+++ b/projects/openttd_vs141.sln
@@ -24,6 +24,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "settings", "settings_vs141.
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "settingsgen", "settingsgen_vs141.vcxproj", "{E9548DE9-F089-49B7-93A6-30BE2CC311C7}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "regression", "regression_vs141.vcxproj", "{4712B013-437D-42CE-947F-DEBABA15261F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -84,6 +86,10 @@ Global
 		{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Release|Win32.Build.0 = Debug|Win32
 		{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Release|x64.ActiveCfg = Debug|Win32
 		{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Release|x64.Build.0 = Debug|Win32
 		{4712B013-437D-42CE-947F-DEBABA15261F}.Debug|Win32.ActiveCfg = Debug|Win32
 		{4712B013-437D-42CE-947F-DEBABA15261F}.Debug|x64.ActiveCfg = Debug|Win32
 		{4712B013-437D-42CE-947F-DEBABA15261F}.Release|Win32.ActiveCfg = Debug|Win32
 		{4712B013-437D-42CE-947F-DEBABA15261F}.Release|x64.ActiveCfg = Debug|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/projects/openttd_vs141.vcxproj
+++ b/projects/openttd_vs141.vcxproj
@@ -22,6 +22,8 @@
    <ProjectName>openttd</ProjectName>
    <ProjectGuid>{668328A0-B40E-4CDB-BD72-D0064424414A}</ProjectGuid>
    <RootNamespace>openttd</RootNamespace>
    <VcpkgTriplet Condition="'$(Platform)'=='Win32'">x86-windows-static</VcpkgTriplet>
    <VcpkgTriplet Condition="'$(Platform)'=='x64'">x64-windows-static</VcpkgTriplet>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -105,7 +107,7 @@
      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
      <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_XAUDIO2;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;WITH_PNG;WITH_FREETYPE;WITH_UNISCRIBE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <ExceptionHandling>Sync</ExceptionHandling>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -136,7 +138,7 @@
      <Culture>0x0809</Culture>
    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;icule.lib;iculx.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -170,7 +172,7 @@
      <Optimization>Disabled</Optimization>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_XAUDIO2;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;WITH_PNG;WITH_FREETYPE;WITH_UNISCRIBE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <PrecompiledHeader>
@@ -192,7 +194,7 @@
      <Culture>0x0809</Culture>
    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;icule.lib;iculx.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <IgnoreSpecificDefaultLibraries>LIBCMT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -228,7 +230,7 @@
      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
      <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_XAUDIO2;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;WITH_PNG;WITH_FREETYPE;WITH_UNISCRIBE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <ExceptionHandling>Sync</ExceptionHandling>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -259,7 +261,7 @@
      <Culture>0x0809</Culture>
    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;icule.lib;iculx.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -291,7 +293,7 @@
      <Optimization>Disabled</Optimization>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_XAUDIO2;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;WITH_PNG;WITH_FREETYPE;WITH_UNISCRIBE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <PrecompiledHeader>
@@ -317,7 +319,7 @@
      <Culture>0x0809</Culture>
    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;icule.lib;iculx.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <IgnoreSpecificDefaultLibraries>LIBCMT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -502,6 +504,7 @@
    <ClInclude Include="..\src\fios.h" />
    <ClInclude Include="..\src\fontcache.h" />
    <ClInclude Include="..\src\fontdetection.h" />
    <ClInclude Include="..\src\framerate_type.h" />
    <ClInclude Include="..\src\base_consist.h" />
    <ClInclude Include="..\src\gamelog.h" />
    <ClInclude Include="..\src\gamelog_internal.h" />
@@ -590,6 +593,8 @@
    <ClInclude Include="..\src\news_func.h" />
    <ClInclude Include="..\src\news_gui.h" />
    <ClInclude Include="..\src\news_type.h" />
    <ClInclude Include="..\src\music\midi.h" />
    <ClInclude Include="..\src\music\midifile.hpp" />
    <ClInclude Include="..\src\music\null_m.h" />
    <ClInclude Include="..\src\sound\null_s.h" />
    <ClInclude Include="..\src\video\null_v.h" />
@@ -616,6 +621,7 @@
    <ClInclude Include="..\src\roadstop_base.h" />
    <ClInclude Include="..\src\roadveh.h" />
    <ClInclude Include="..\src\safeguards.h" />
    <ClInclude Include="..\src\scope.h" />
    <ClInclude Include="..\src\screenshot.h" />
    <ClInclude Include="..\src\sdl.h" />
    <ClInclude Include="..\src\sound\sdl_s.h" />
@@ -650,6 +656,7 @@
    <ClInclude Include="..\src\string_base.h" />
    <ClInclude Include="..\src\string_func.h" />
    <ClInclude Include="..\src\string_type.h" />
    <ClInclude Include="..\src\os\windows\string_uniscribe.h" />
    <ClInclude Include="..\src\stringfilter_type.h" />
    <ClInclude Include="..\src\strings_func.h" />
    <ClInclude Include="..\src\strings_type.h" />
@@ -703,6 +710,7 @@
    <ClInclude Include="..\src\window_func.h" />
    <ClInclude Include="..\src\window_gui.h" />
    <ClInclude Include="..\src\window_type.h" />
    <ClInclude Include="..\src\sound\xaudio2_s.h" />
    <ClInclude Include="..\src\zoom_func.h" />
    <ClInclude Include="..\src\zoom_type.h" />
    <ClCompile Include="..\src\core\alloc_func.cpp" />
@@ -711,6 +719,8 @@
    <ClInclude Include="..\src\core\backup_type.hpp" />
    <ClCompile Include="..\src\core\bitmath_func.cpp" />
    <ClInclude Include="..\src\core\bitmath_func.hpp" />
    <ClInclude Include="..\src\core\container_func.hpp" />
    <ClInclude Include="..\src\core\dyn_arena_alloc.hpp" />
    <ClInclude Include="..\src\core\endian_func.hpp" />
    <ClInclude Include="..\src\core\endian_type.hpp" />
    <ClInclude Include="..\src\core\enum_type.hpp" />
@@ -748,6 +758,7 @@
    <ClCompile Include="..\src\engine_gui.cpp" />
    <ClCompile Include="..\src\error_gui.cpp" />
    <ClCompile Include="..\src\fios_gui.cpp" />
    <ClCompile Include="..\src\framerate_gui.cpp" />
    <ClCompile Include="..\src\genworld_gui.cpp" />
    <ClCompile Include="..\src\goal_gui.cpp" />
    <ClCompile Include="..\src\graph_gui.cpp" />
@@ -809,6 +820,7 @@
    <ClInclude Include="..\src\widgets\engine_widget.h" />
    <ClInclude Include="..\src\widgets\error_widget.h" />
    <ClInclude Include="..\src\widgets\fios_widget.h" />
    <ClInclude Include="..\src\widgets\framerate_widget.h" />
    <ClInclude Include="..\src\widgets\genworld_widget.h" />
    <ClInclude Include="..\src\widgets\goal_widget.h" />
    <ClInclude Include="..\src\widgets\graph_widget.h" />
@@ -1167,6 +1179,8 @@
    <ClCompile Include="..\src\script\api\script_window.cpp" />
    <ClCompile Include="..\src\blitter\32bpp_anim.cpp" />
    <ClInclude Include="..\src\blitter\32bpp_anim.hpp" />
    <ClCompile Include="..\src\blitter\32bpp_anim_sse2.cpp" />
    <ClInclude Include="..\src\blitter\32bpp_anim_sse2.hpp" />
    <ClCompile Include="..\src\blitter\32bpp_anim_sse4.cpp" />
    <ClInclude Include="..\src\blitter\32bpp_anim_sse4.hpp" />
    <ClCompile Include="..\src\blitter\32bpp_base.cpp" />
@@ -1311,12 +1325,15 @@
    <ClCompile Include="..\src\video\win32_v.cpp" />
    <ClCompile Include="..\src\music\dmusic.cpp" />
    <ClCompile Include="..\src\music\null_m.cpp" />
    <ClCompile Include="..\src\music\midifile.cpp" />
    <ClCompile Include="..\src\music\win32_m.cpp" />
    <ClCompile Include="..\src\sound\null_s.cpp" />
    <ClCompile Include="..\src\sound\sdl_s.cpp" />
    <ClCompile Include="..\src\sound\win32_s.cpp" />
    <ClCompile Include="..\src\sound\xaudio2_s.cpp" />
    <ClCompile Include="..\src\os\windows\crashlog_win.cpp" />
    <ResourceCompile Include="..\src\os\windows\ottdres.rc" />
    <ClCompile Include="..\src\os\windows\string_uniscribe.cpp" />
    <ClCompile Include="..\src\os\windows\win32.cpp" />
    <ClInclude Include="..\src\thread\thread.h" />
    <ClCompile Include="..\src\thread\thread_win32.cpp" />
--- a/projects/openttd_vs141.vcxproj.filters
+++ b/projects/openttd_vs141.vcxproj.filters
@@ -600,6 +600,9 @@
    <ClInclude Include="..\src\fontdetection.h">
      <Filter>Header Files</Filter>
    </ClInclude>
    <ClInclude Include="..\src\framerate_type.h">
      <Filter>Header Files</Filter>
    </ClInclude>
    <ClInclude Include="..\src\base_consist.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -864,6 +867,12 @@
    <ClInclude Include="..\src\news_type.h">
      <Filter>Header Files</Filter>
    </ClInclude>
    <ClInclude Include="..\src\music\midi.h">
      <Filter>Header Files</Filter>
    </ClInclude>
    <ClInclude Include="..\src\music\midifile.hpp">
      <Filter>Header Files</Filter>
    </ClInclude>
    <ClInclude Include="..\src\music\null_m.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -942,6 +951,9 @@
    <ClInclude Include="..\src\safeguards.h">
      <Filter>Header Files</Filter>
    </ClInclude>
    <ClInclude Include="..\src\scope.h">
      <Filter>Header Files</Filter>
    </ClInclude>
    <ClInclude Include="..\src\screenshot.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -1044,6 +1056,9 @@
    <ClInclude Include="..\src\string_type.h">
      <Filter>Header Files</Filter>
    </ClInclude>
    <ClInclude Include="..\src\os\windows\string_uniscribe.h">
      <Filter>Header Files</Filter>
    </ClInclude>
    <ClInclude Include="..\src\stringfilter_type.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -1203,6 +1218,9 @@
    <ClInclude Include="..\src\window_type.h">
      <Filter>Header Files</Filter>
    </ClInclude>
    <ClInclude Include="..\src\sound\xaudio2_s.h">
      <Filter>Header Files</Filter>
    </ClInclude>
    <ClInclude Include="..\src\zoom_func.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -1227,6 +1245,12 @@
    <ClInclude Include="..\src\core\bitmath_func.hpp">
      <Filter>Core Source Code</Filter>
    </ClInclude>
    <ClInclude Include="..\src\core\container_func.hpp">
      <Filter>Core Source Code</Filter>
    </ClInclude>
    <ClInclude Include="..\src\core\dyn_arena_alloc.hpp">
      <Filter>Core Source Code</Filter>
    </ClInclude>
    <ClInclude Include="..\src\core\endian_func.hpp">
      <Filter>Core Source Code</Filter>
    </ClInclude>
@@ -1338,6 +1362,9 @@
    <ClCompile Include="..\src\fios_gui.cpp">
      <Filter>GUI Source Code</Filter>
    </ClCompile>
    <ClCompile Include="..\src\framerate_gui.cpp">
      <Filter>GUI Source Code</Filter>
    </ClCompile>
    <ClCompile Include="..\src\genworld_gui.cpp">
      <Filter>GUI Source Code</Filter>
    </ClCompile>
@@ -1521,6 +1548,9 @@
    <ClInclude Include="..\src\widgets\fios_widget.h">
      <Filter>Widgets</Filter>
    </ClInclude>
    <ClInclude Include="..\src\widgets\framerate_widget.h">
      <Filter>Widgets</Filter>
    </ClInclude>
    <ClInclude Include="..\src\widgets\genworld_widget.h">
      <Filter>Widgets</Filter>
    </ClInclude>
@@ -2595,6 +2625,12 @@
    <ClInclude Include="..\src\blitter\32bpp_anim.hpp">
      <Filter>Blitters</Filter>
    </ClInclude>
    <ClCompile Include="..\src\blitter\32bpp_anim_sse2.cpp">
      <Filter>Blitters</Filter>
    </ClCompile>
    <ClInclude Include="..\src\blitter\32bpp_anim_sse2.hpp">
      <Filter>Blitters</Filter>
    </ClInclude>
    <ClCompile Include="..\src\blitter\32bpp_anim_sse4.cpp">
      <Filter>Blitters</Filter>
    </ClCompile>
@@ -3027,6 +3063,9 @@
    <ClCompile Include="..\src\music\null_m.cpp">
      <Filter>Music</Filter>
    </ClCompile>
    <ClCompile Include="..\src\music\midifile.cpp">
      <Filter>Music</Filter>
    </ClCompile>
    <ClCompile Include="..\src\music\win32_m.cpp">
      <Filter>Music</Filter>
    </ClCompile>
@@ -3039,12 +3078,18 @@
    <ClCompile Include="..\src\sound\win32_s.cpp">
      <Filter>Sound</Filter>
    </ClCompile>
    <ClCompile Include="..\src\sound\xaudio2_s.cpp">
      <Filter>Sound</Filter>
    </ClCompile>
    <ClCompile Include="..\src\os\windows\crashlog_win.cpp">
      <Filter>Windows files</Filter>
    </ClCompile>
    <ResourceCompile Include="..\src\os\windows\ottdres.rc">
      <Filter>Windows files</Filter>
    </ResourceCompile>
    <ClCompile Include="..\src\os\windows\string_uniscribe.cpp">
      <Filter>Windows files</Filter>
    </ClCompile>
    <ClCompile Include="..\src\os\windows\win32.cpp">
      <Filter>Windows files</Filter>
    </ClCompile>
--- a/projects/openttd_vs141.vcxproj.in
+++ b/projects/openttd_vs141.vcxproj.in
@@ -22,6 +22,8 @@
    <ProjectName>openttd</ProjectName>
    <ProjectGuid>{668328A0-B40E-4CDB-BD72-D0064424414A}</ProjectGuid>
    <RootNamespace>openttd</RootNamespace>
    <VcpkgTriplet Condition="'$(Platform)'=='Win32'">x86-windows-static</VcpkgTriplet>
    <VcpkgTriplet Condition="'$(Platform)'=='x64'">x64-windows-static</VcpkgTriplet>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -105,7 +107,7 @@
      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
      <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_XAUDIO2;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;WITH_PNG;WITH_FREETYPE;WITH_UNISCRIBE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <ExceptionHandling>Sync</ExceptionHandling>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -136,7 +138,7 @@
      <Culture>0x0809</Culture>
    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;icule.lib;iculx.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -170,7 +172,7 @@
      <Optimization>Disabled</Optimization>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_XAUDIO2;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;WITH_PNG;WITH_FREETYPE;WITH_UNISCRIBE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <PrecompiledHeader>
@@ -192,7 +194,7 @@
      <Culture>0x0809</Culture>
    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;icule.lib;iculx.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <IgnoreSpecificDefaultLibraries>LIBCMT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -228,7 +230,7 @@
      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
      <OmitFramePointers>true</OmitFramePointers>
      <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_XAUDIO2;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;WITH_PNG;WITH_FREETYPE;WITH_UNISCRIBE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <StringPooling>true</StringPooling>
      <ExceptionHandling>Sync</ExceptionHandling>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -259,7 +261,7 @@
      <Culture>0x0809</Culture>
    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;icule.lib;iculx.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
      <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -291,7 +293,7 @@
      <Optimization>Disabled</Optimization>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <AdditionalIncludeDirectories>..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_XAUDIO2;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;WITH_PNG;WITH_FREETYPE;WITH_UNISCRIBE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <PrecompiledHeader>
@@ -317,7 +319,7 @@
      <Culture>0x0809</Culture>
    </ResourceCompile>
    <Link>
-      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;libpng.lib;zlibstat.lib;lzo2.lib;liblzma.lib;libfreetype2.lib;icuuc.lib;icuin.lib;icudt.lib;icule.lib;iculx.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winmm.lib;ws2_32.lib;imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <IgnoreSpecificDefaultLibraries>LIBCMT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
      <GenerateDebugInformation>true</GenerateDebugInformation>
--- a/projects/openttd_vs80.sln
+++ b/projects/openttd_vs80.sln
@@ -1,95 +0,0 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual C++ Express 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openttd", "openttd_vs80.vcproj", "{668328A0-B40E-4CDB-BD72-D0064424414A}"
 	ProjectSection(ProjectDependencies) = postProject
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966} = {0F066B23-18DF-4284-8265-F4A5E7E3B966}
 		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC} = {1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}
 		{0817F629-589E-4A3B-B81A-8647BC571E35} = {0817F629-589E-4A3B-B81A-8647BC571E35}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "strgen", "strgen_vs80.vcproj", "{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "langs", "langs_vs80.vcproj", "{0F066B23-18DF-4284-8265-F4A5E7E3B966}"
 	ProjectSection(ProjectDependencies) = postProject
 		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1} = {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "version", "version_vs80.vcproj", "{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "generate", "generate_vs80.vcproj", "{2F31FD79-D1AC-43C4-89F3-B0D5E4E53E34}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "settings", "settings_vs80.vcproj", "{0817F629-589E-4A3B-B81A-8647BC571E35}"
 	ProjectSection(ProjectDependencies) = postProject
 		{E9548DE9-F089-49B7-93A6-30BE2CC311C7} = {E9548DE9-F089-49B7-93A6-30BE2CC311C7}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "settings_gen", "settingsgen_vs80.vcproj", "{E9548DE9-F089-49B7-93A6-30BE2CC311C7}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
 		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{668328A0-B40E-4CDB-BD72-D0064424414A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{668328A0-B40E-4CDB-BD72-D0064424414A}.Debug|Win32.Build.0 = Debug|Win32
 		{668328A0-B40E-4CDB-BD72-D0064424414A}.Debug|x64.ActiveCfg = Debug|x64
 		{668328A0-B40E-4CDB-BD72-D0064424414A}.Debug|x64.Build.0 = Debug|x64
 		{668328A0-B40E-4CDB-BD72-D0064424414A}.Release|Win32.ActiveCfg = Release|Win32
 		{668328A0-B40E-4CDB-BD72-D0064424414A}.Release|Win32.Build.0 = Release|Win32
 		{668328A0-B40E-4CDB-BD72-D0064424414A}.Release|x64.ActiveCfg = Release|x64
 		{668328A0-B40E-4CDB-BD72-D0064424414A}.Release|x64.Build.0 = Release|x64
 		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug|Win32.ActiveCfg = Debug|Win32
 		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug|Win32.Build.0 = Debug|Win32
 		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug|x64.ActiveCfg = Debug|Win32
 		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug|x64.Build.0 = Debug|Win32
 		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release|Win32.ActiveCfg = Debug|Win32
 		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release|Win32.Build.0 = Debug|Win32
 		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release|x64.ActiveCfg = Debug|Win32
 		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release|x64.Build.0 = Debug|Win32
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Debug|Win32.ActiveCfg = Debug|Win32
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Debug|Win32.Build.0 = Debug|Win32
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Debug|x64.ActiveCfg = Debug|Win32
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Debug|x64.Build.0 = Debug|Win32
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release|Win32.ActiveCfg = Debug|Win32
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release|Win32.Build.0 = Debug|Win32
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release|x64.ActiveCfg = Debug|Win32
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release|x64.Build.0 = Debug|Win32
 		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Debug|Win32.ActiveCfg = Debug|Win32
 		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Debug|Win32.Build.0 = Debug|Win32
 		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Debug|x64.ActiveCfg = Debug|Win32
 		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Debug|x64.Build.0 = Debug|Win32
 		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Release|Win32.ActiveCfg = Debug|Win32
 		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Release|Win32.Build.0 = Debug|Win32
 		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Release|x64.ActiveCfg = Debug|Win32
 		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Release|x64.Build.0 = Debug|Win32
 		{2F31FD79-D1AC-43C4-89F3-B0D5E4E53E34}.Debug|Win32.ActiveCfg = Debug|Win32
 		{2F31FD79-D1AC-43C4-89F3-B0D5E4E53E34}.Debug|x64.ActiveCfg = Debug|Win32
 		{2F31FD79-D1AC-43C4-89F3-B0D5E4E53E34}.Release|Win32.ActiveCfg = Debug|Win32
 		{2F31FD79-D1AC-43C4-89F3-B0D5E4E53E34}.Release|x64.ActiveCfg = Debug|Win32
 		{0817F629-589E-4A3B-B81A-8647BC571E35}.Debug|Win32.ActiveCfg = Debug|Win32
 		{0817F629-589E-4A3B-B81A-8647BC571E35}.Debug|Win32.Build.0 = Debug|Win32
 		{0817F629-589E-4A3B-B81A-8647BC571E35}.Debug|x64.ActiveCfg = Debug|Win32
 		{0817F629-589E-4A3B-B81A-8647BC571E35}.Debug|x64.Build.0 = Debug|Win32
 		{0817F629-589E-4A3B-B81A-8647BC571E35}.Release|Win32.ActiveCfg = Debug|Win32
 		{0817F629-589E-4A3B-B81A-8647BC571E35}.Release|Win32.Build.0 = Debug|Win32
 		{0817F629-589E-4A3B-B81A-8647BC571E35}.Release|x64.ActiveCfg = Debug|Win32
 		{0817F629-589E-4A3B-B81A-8647BC571E35}.Release|x64.Build.0 = Debug|Win32
 		{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Debug|Win32.ActiveCfg = Debug|Win32
 		{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Debug|Win32.Build.0 = Debug|Win32
 		{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Debug|x64.ActiveCfg = Debug|Win32
 		{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Debug|x64.Build.0 = Debug|Win32
 		{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Release|Win32.ActiveCfg = Debug|Win32
 		{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Release|Win32.Build.0 = Debug|Win32
 		{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Release|x64.ActiveCfg = Debug|Win32
 		{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Release|x64.Build.0 = Debug|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(DPCodeReviewSolutionGUID) = preSolution
 		DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
 	EndGlobalSection
 EndGlobal
--- a/projects/openttd_vs80.vcproj.in
+++ b/projects/openttd_vs80.vcproj.in
@@ -1,454 +0,0 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="openttd"
 	ProjectGUID="{668328A0-B40E-4CDB-BD72-D0064424414A}"
 	RootNamespace="openttd"
 	>
 	<Platforms>
 		<Platform
 			Name="Win32"
 		/>
 		<Platform
 			Name="x64"
 		/>
 	</Platforms>
 	<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="1"
 			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
 			/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
 			<Tool
 				Name="VCMIDLTool"
 				TypeLibraryName=".\Release/openttd.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="3"
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
 				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"
 				WarningLevel="3"
 				WarnAsError="false"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
 				CallingConvention="1"
 				CompileAs="0"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="2057"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="winmm.lib ws2_32.lib imm32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib icule.lib iculx.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				StackReserveSize="1048576"
 				StackCommitSize="1048576"
 				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"
 				Description=""
 				CommandLine="copy &quot;$(OutDir)$(TargetName)$(TargetExt)&quot; &quot;$(SolutionDir)..\bin\$(TargetName)$(TargetExt)&quot;"
 			/>
 		</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="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
 			/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
 			<Tool
 				Name="VCMIDLTool"
 				TypeLibraryName=".\Debug/openttd.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
 				AssemblerListingLocation="$(IntDir)/"
 				ObjectFile="$(IntDir)/"
 				ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"
 				WarningLevel="3"
 				WarnAsError="false"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="4"
 				CallingConvention="1"
 				CompileAs="0"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="2057"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="winmm.lib ws2_32.lib imm32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib icule.lib iculx.lib"
 				LinkIncremental="0"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames="LIBCMT.lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				StackReserveSize="1048576"
 				StackCommitSize="1048576"
 				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"
 				Description=""
 				CommandLine="copy &quot;$(OutDir)$(TargetName)$(TargetExt)&quot; &quot;$(SolutionDir)..\bin\$(TargetName)$(TargetExt)&quot;"
 			/>
 		</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="1"
 			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
 			/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
 			<Tool
 				Name="VCMIDLTool"
 				TargetEnvironment="3"
 				TypeLibraryName=".\Release/openttd.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="3"
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
 				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"
 				WarningLevel="3"
 				WarnAsError="false"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
 				CallingConvention="1"
 				CompileAs="0"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="2057"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="winmm.lib ws2_32.lib imm32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib icule.lib iculx.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				StackReserveSize="1048576"
 				StackCommitSize="1048576"
 				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"
 				Description=""
 				CommandLine="copy &quot;$(OutDir)$(TargetName)$(TargetExt)&quot; &quot;$(SolutionDir)..\bin\$(TargetName)$(TargetExt)&quot;"
 			/>
 		</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="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
 			/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
 			<Tool
 				Name="VCMIDLTool"
 				TargetEnvironment="3"
 				TypeLibraryName=".\Debug/openttd.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
 				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="2057"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="winmm.lib ws2_32.lib imm32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib icule.lib iculx.lib"
 				LinkIncremental="0"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames="LIBCMT.lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				StackReserveSize="1048576"
 				StackCommitSize="1048576"
 				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"
 				Description=""
 				CommandLine="copy &quot;$(OutDir)$(TargetName)$(TargetExt)&quot; &quot;$(SolutionDir)..\bin\$(TargetName)$(TargetExt)&quot;"
 			/>
 		</Configuration>
 	</Configurations>
 	<References>
 	</References>
 	<Files>
 !!FILES!!
 		<File
 			RelativePath=".\..\media\openttd.ico"
 			>
 		</File>
 		<File
 			RelativePath=".\..\README.md"
 			>
 		</File>
 	</Files>
 	<Globals>
 	</Globals>
 </VisualStudioProject>
--- a/projects/openttd_vs80.vcproj.user
+++ b/projects/openttd_vs80.vcproj.user
@@ -1,37 +0,0 @@
 <?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/openttd_vs90.sln
+++ b/projects/openttd_vs90.sln
@@ -1,95 +0,0 @@
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual C++ Express 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openttd", "openttd_vs90.vcproj", "{668328A0-B40E-4CDB-BD72-D0064424414A}"
 	ProjectSection(ProjectDependencies) = postProject
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966} = {0F066B23-18DF-4284-8265-F4A5E7E3B966}
 		{0817F629-589E-4A3B-B81A-8647BC571E35} = {0817F629-589E-4A3B-B81A-8647BC571E35}
 		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC} = {1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "strgen", "strgen_vs90.vcproj", "{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "langs", "langs_vs90.vcproj", "{0F066B23-18DF-4284-8265-F4A5E7E3B966}"
 	ProjectSection(ProjectDependencies) = postProject
 		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1} = {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "version", "version_vs90.vcproj", "{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "generate", "generate_vs90.vcproj", "{2F31FD79-D1AC-43C4-89F3-B0D5E4E53E34}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "settings", "settings_vs90.vcproj", "{0817F629-589E-4A3B-B81A-8647BC571E35}"
 	ProjectSection(ProjectDependencies) = postProject
 		{E9548DE9-F089-49B7-93A6-30BE2CC311C7} = {E9548DE9-F089-49B7-93A6-30BE2CC311C7}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "settingsgen", "settingsgen_vs90.vcproj", "{E9548DE9-F089-49B7-93A6-30BE2CC311C7}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
 		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{668328A0-B40E-4CDB-BD72-D0064424414A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{668328A0-B40E-4CDB-BD72-D0064424414A}.Debug|Win32.Build.0 = Debug|Win32
 		{668328A0-B40E-4CDB-BD72-D0064424414A}.Debug|x64.ActiveCfg = Debug|x64
 		{668328A0-B40E-4CDB-BD72-D0064424414A}.Debug|x64.Build.0 = Debug|x64
 		{668328A0-B40E-4CDB-BD72-D0064424414A}.Release|Win32.ActiveCfg = Release|Win32
 		{668328A0-B40E-4CDB-BD72-D0064424414A}.Release|Win32.Build.0 = Release|Win32
 		{668328A0-B40E-4CDB-BD72-D0064424414A}.Release|x64.ActiveCfg = Release|x64
 		{668328A0-B40E-4CDB-BD72-D0064424414A}.Release|x64.Build.0 = Release|x64
 		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug|Win32.ActiveCfg = Debug|Win32
 		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug|Win32.Build.0 = Debug|Win32
 		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug|x64.ActiveCfg = Debug|Win32
 		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug|x64.Build.0 = Debug|Win32
 		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release|Win32.ActiveCfg = Debug|Win32
 		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release|Win32.Build.0 = Debug|Win32
 		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release|x64.ActiveCfg = Debug|Win32
 		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release|x64.Build.0 = Debug|Win32
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Debug|Win32.ActiveCfg = Debug|Win32
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Debug|Win32.Build.0 = Debug|Win32
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Debug|x64.ActiveCfg = Debug|Win32
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Debug|x64.Build.0 = Debug|Win32
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release|Win32.ActiveCfg = Debug|Win32
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release|Win32.Build.0 = Debug|Win32
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release|x64.ActiveCfg = Debug|Win32
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release|x64.Build.0 = Debug|Win32
 		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Debug|Win32.ActiveCfg = Debug|Win32
 		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Debug|Win32.Build.0 = Debug|Win32
 		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Debug|x64.ActiveCfg = Debug|Win32
 		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Debug|x64.Build.0 = Debug|Win32
 		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Release|Win32.ActiveCfg = Debug|Win32
 		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Release|Win32.Build.0 = Debug|Win32
 		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Release|x64.ActiveCfg = Debug|Win32
 		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Release|x64.Build.0 = Debug|Win32
 		{2F31FD79-D1AC-43C4-89F3-B0D5E4E53E34}.Debug|Win32.ActiveCfg = Debug|Win32
 		{2F31FD79-D1AC-43C4-89F3-B0D5E4E53E34}.Debug|x64.ActiveCfg = Debug|Win32
 		{2F31FD79-D1AC-43C4-89F3-B0D5E4E53E34}.Release|Win32.ActiveCfg = Debug|Win32
 		{2F31FD79-D1AC-43C4-89F3-B0D5E4E53E34}.Release|x64.ActiveCfg = Debug|Win32
 		{0817F629-589E-4A3B-B81A-8647BC571E35}.Debug|Win32.ActiveCfg = Debug|Win32
 		{0817F629-589E-4A3B-B81A-8647BC571E35}.Debug|Win32.Build.0 = Debug|Win32
 		{0817F629-589E-4A3B-B81A-8647BC571E35}.Debug|x64.ActiveCfg = Debug|Win32
 		{0817F629-589E-4A3B-B81A-8647BC571E35}.Debug|x64.Build.0 = Debug|Win32
 		{0817F629-589E-4A3B-B81A-8647BC571E35}.Release|Win32.ActiveCfg = Debug|Win32
 		{0817F629-589E-4A3B-B81A-8647BC571E35}.Release|Win32.Build.0 = Debug|Win32
 		{0817F629-589E-4A3B-B81A-8647BC571E35}.Release|x64.ActiveCfg = Debug|Win32
 		{0817F629-589E-4A3B-B81A-8647BC571E35}.Release|x64.Build.0 = Debug|Win32
 		{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Debug|Win32.ActiveCfg = Debug|Win32
 		{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Debug|Win32.Build.0 = Debug|Win32
 		{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Debug|x64.ActiveCfg = Debug|Win32
 		{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Debug|x64.Build.0 = Debug|Win32
 		{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Release|Win32.ActiveCfg = Debug|Win32
 		{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Release|Win32.Build.0 = Debug|Win32
 		{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Release|x64.ActiveCfg = Debug|Win32
 		{E9548DE9-F089-49B7-93A6-30BE2CC311C7}.Release|x64.Build.0 = Debug|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(DPCodeReviewSolutionGUID) = preSolution
 		DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
 	EndGlobalSection
 EndGlobal
--- a/projects/openttd_vs90.vcproj.in
+++ b/projects/openttd_vs90.vcproj.in
@@ -1,451 +0,0 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9.00"
 	Name="openttd"
 	ProjectGUID="{668328A0-B40E-4CDB-BD72-D0064424414A}"
 	RootNamespace="openttd"
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
 			Name="Win32"
 		/>
 		<Platform
 			Name="x64"
 		/>
 	</Platforms>
 	<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="1"
 			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
 			/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
 			<Tool
 				Name="VCMIDLTool"
 				TypeLibraryName=".\Release/openttd.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="3"
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
 				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"
 				WarningLevel="3"
 				WarnAsError="false"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
 				CallingConvention="1"
 				CompileAs="0"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="2057"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="winmm.lib ws2_32.lib imm32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib icule.lib iculx.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				StackReserveSize="1048576"
 				StackCommitSize="1048576"
 				OptimizeReferences="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
 			<Tool
 				Name="VCManifestTool"
 			/>
 			<Tool
 				Name="VCXDCMakeTool"
 			/>
 			<Tool
 				Name="VCBscMakeTool"
 			/>
 			<Tool
 				Name="VCFxCopTool"
 			/>
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description=""
 				CommandLine="copy &quot;$(OutDir)$(TargetName)$(TargetExt)&quot; &quot;$(SolutionDir)..\bin\$(TargetName)$(TargetExt)&quot;"
 			/>
 		</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="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
 			/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
 			<Tool
 				Name="VCMIDLTool"
 				TypeLibraryName=".\Debug/openttd.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
 				AssemblerListingLocation="$(IntDir)/"
 				ObjectFile="$(IntDir)/"
 				ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"
 				WarningLevel="3"
 				WarnAsError="false"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="4"
 				CallingConvention="1"
 				CompileAs="0"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="2057"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="winmm.lib ws2_32.lib imm32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib icule.lib iculx.lib"
 				LinkIncremental="0"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames="LIBCMT.lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				StackReserveSize="1048576"
 				StackCommitSize="1048576"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
 			<Tool
 				Name="VCManifestTool"
 			/>
 			<Tool
 				Name="VCXDCMakeTool"
 			/>
 			<Tool
 				Name="VCBscMakeTool"
 			/>
 			<Tool
 				Name="VCFxCopTool"
 			/>
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description=""
 				CommandLine="copy &quot;$(OutDir)$(TargetName)$(TargetExt)&quot; &quot;$(SolutionDir)..\bin\$(TargetName)$(TargetExt)&quot;"
 			/>
 		</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="1"
 			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
 			/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
 			<Tool
 				Name="VCMIDLTool"
 				TargetEnvironment="3"
 				TypeLibraryName=".\Release/openttd.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="3"
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
 				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"
 				WarningLevel="3"
 				WarnAsError="false"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
 				CallingConvention="1"
 				CompileAs="0"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="2057"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="winmm.lib ws2_32.lib imm32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib icule.lib iculx.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				StackReserveSize="1048576"
 				StackCommitSize="1048576"
 				OptimizeReferences="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"
 				Description=""
 				CommandLine="copy &quot;$(OutDir)$(TargetName)$(TargetExt)&quot; &quot;$(SolutionDir)..\bin\$(TargetName)$(TargetExt)&quot;"
 			/>
 		</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="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
 			/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
 			<Tool
 				Name="VCMIDLTool"
 				TargetEnvironment="3"
 				TypeLibraryName=".\Debug/openttd.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU_SORT;WITH_ICU_LAYOUT;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
 				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="2057"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="winmm.lib ws2_32.lib imm32.lib libpng.lib zlibstat.lib lzo2.lib liblzma.lib libfreetype2.lib icuuc.lib icuin.lib icudt.lib icule.lib iculx.lib"
 				LinkIncremental="0"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames="LIBCMT.lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				StackReserveSize="1048576"
 				StackCommitSize="1048576"
 				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"
 				Description=""
 				CommandLine="copy &quot;$(OutDir)$(TargetName)$(TargetExt)&quot; &quot;$(SolutionDir)..\bin\$(TargetName)$(TargetExt)&quot;"
 			/>
 		</Configuration>
 	</Configurations>
 	<References>
 	</References>
 	<Files>
 !!FILES!!
 		<File
 			RelativePath=".\..\media\openttd.ico"
 			>
 		</File>
 		<File
 			RelativePath=".\..\README.md"
 			>
 		</File>
 	</Files>
 	<Globals>
 	</Globals>
 </VisualStudioProject>
--- a/projects/openttd_vs90.vcproj.user
+++ b/projects/openttd_vs90.vcproj.user
@@ -1,37 +0,0 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioUserFile
 	ProjectType="Visual C++"
 	Version="9.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/regression.bat
+++ b/projects/regression.bat
@@ -0,0 +1,6 @@
 cd ..\bin
 editbin /nologo /subsystem:console openttd.exe
 cscript /nologo ai\regression\run.vbs
 set RESULT=%ERRORLEVEL%
 editbin /nologo /subsystem:windows openttd.exe
 exit %RESULT%
--- a/projects/regression_vs140.vcxproj
+++ b/projects/regression_vs140.vcxproj
@@ -0,0 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectGuid>{4712B013-437D-42CE-947F-DEBABA15261F}</ProjectGuid>
    <RootNamespace>regression</RootNamespace>
    <ProjectName>regression</ProjectName>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Makefile</ConfigurationType>
    <PlatformToolset>v140</PlatformToolset>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Label="Shared">
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <NMakeBuildCommandLine>call regression.bat</NMakeBuildCommandLine>
    <NMakeReBuildCommandLine>call regression.bat</NMakeReBuildCommandLine>
    <NMakeCleanCommandLine>del ..\bin\tmp.regression</NMakeCleanCommandLine>
  </PropertyGroup>
  <ItemGroup>
    <ProjectReference Include="openttd_vs140.vcxproj">
      <Project>{668328a0-b40e-4cdb-bd72-d0064424414a}</Project>
    </ProjectReference>
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
 </Project>
--- a/projects/regression_vs141.vcxproj
+++ b/projects/regression_vs141.vcxproj
@@ -0,0 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectGuid>{4712B013-437D-42CE-947F-DEBABA15261F}</ProjectGuid>
    <RootNamespace>regression</RootNamespace>
    <ProjectName>regression</ProjectName>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Makefile</ConfigurationType>
    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Label="Shared">
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <NMakeBuildCommandLine>call regression.bat</NMakeBuildCommandLine>
    <NMakeReBuildCommandLine>call regression.bat</NMakeReBuildCommandLine>
    <NMakeCleanCommandLine>del ..\bin\tmp.regression</NMakeCleanCommandLine>
  </PropertyGroup>
  <ItemGroup>
    <ProjectReference Include="openttd_vs141.vcxproj">
      <Project>{668328a0-b40e-4cdb-bd72-d0064424414a}</Project>
    </ProjectReference>
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
 </Project>
--- a/projects/settings_vs100.vcxproj
+++ b/projects/settings_vs100.vcxproj
@@ -1,54 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectName>settings</ProjectName>
    <ProjectGuid>{0817F629-589E-4A3B-B81A-8647BC571E35}</ProjectGuid>
    <RootNamespace>settings</RootNamespace>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Makefile</ConfigurationType>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros">
    <SettingsCommandLine>
 ..\objs\settings\settings_gen.exe -o ..\objs\settings\table\settings.h -b ..\src\table\settings.h.preamble -a ..\src\table\settings.h.postamble ..\src\table\company_settings.ini ..\src\table\currency_settings.ini ..\src\table\gameopt_settings.ini ..\src\table\misc_settings.ini ..\src\table\settings.ini ..\src\table\win32_settings.ini ..\src\table\window_settings.ini
    </SettingsCommandLine>
  </PropertyGroup>
  <PropertyGroup>
    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\settings\table\</OutDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\settings\table\</IntDir>
    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SettingsCommandLine)</NMakeBuildCommandLine>
    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SettingsCommandLine)</NMakeReBuildCommandLine>
    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">del ..\objs\settings\table\settings.h</NMakeCleanCommandLine>
    <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\settings\table\settings.h</NMakeOutput>
  </PropertyGroup>
  <ItemGroup>
    <None Include="..\src\table\company_settings.ini" />
    <None Include="..\src\table\currency_settings.ini" />
    <None Include="..\src\table\gameopt_settings.ini" />
    <None Include="..\src\table\misc_settings.ini" />
    <None Include="..\src\table\settings.ini" />
    <None Include="..\src\table\win32_settings.ini" />
    <None Include="..\src\table\window_settings.ini" />
  </ItemGroup>
  <ItemGroup>
    <None Include="..\src\table\settings.h.postamble" />
    <None Include="..\src\table\settings.h.preamble" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
 </Project>
--- a/projects/settings_vs100.vcxproj.filters
+++ b/projects/settings_vs100.vcxproj.filters
@@ -1,35 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="INI">
      <UniqueIdentifier>{21deca6c-8df4-4f34-9dad-17d7781cd5a0}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
    <None Include="..\src\table\company_settings.ini">
      <Filter>INI</Filter>
    </None>
    <None Include="..\src\table\currency_settings.ini">
      <Filter>INI</Filter>
    </None>
    <None Include="..\src\table\gameopt_settings.ini">
      <Filter>INI</Filter>
    </None>
    <None Include="..\src\table\misc_settings.ini">
      <Filter>INI</Filter>
    </None>
    <None Include="..\src\table\settings.ini">
      <Filter>INI</Filter>
    </None>
    <None Include="..\src\table\win32_settings.ini">
      <Filter>INI</Filter>
    </None>
    <None Include="..\src\table\window_settings.ini">
      <Filter>INI</Filter>
    </None>
  </ItemGroup>
  <ItemGroup>
    <None Include="..\src\table\settings.h.postamble" />
    <None Include="..\src\table\settings.h.preamble" />
  </ItemGroup>
 </Project>
--- a/projects/settings_vs100.vcxproj.filters.in
+++ b/projects/settings_vs100.vcxproj.filters.in
@@ -1,15 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="INI">
      <UniqueIdentifier>{21deca6c-8df4-4f34-9dad-17d7781cd5a0}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
 !!FILES!!
  </ItemGroup>
  <ItemGroup>
    <None Include="..\src\table\settings.h.postamble" />
    <None Include="..\src\table\settings.h.preamble" />
  </ItemGroup>
 </Project>
--- a/projects/settings_vs100.vcxproj.in
+++ b/projects/settings_vs100.vcxproj.in
@@ -1,48 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectName>settings</ProjectName>
    <ProjectGuid>{0817F629-589E-4A3B-B81A-8647BC571E35}</ProjectGuid>
    <RootNamespace>settings</RootNamespace>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Makefile</ConfigurationType>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros">
    <SettingsCommandLine>
 !!FILTERS!!
    </SettingsCommandLine>
  </PropertyGroup>
  <PropertyGroup>
    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\settings\table\</OutDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\settings\table\</IntDir>
    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SettingsCommandLine)</NMakeBuildCommandLine>
    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SettingsCommandLine)</NMakeReBuildCommandLine>
    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">del ..\objs\settings\table\settings.h</NMakeCleanCommandLine>
    <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\settings\table\settings.h</NMakeOutput>
  </PropertyGroup>
  <ItemGroup>
 !!FILES!!
  </ItemGroup>
  <ItemGroup>
    <None Include="..\src\table\settings.h.postamble" />
    <None Include="..\src\table\settings.h.preamble" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
 </Project>
--- a/projects/settings_vs80.vcproj
+++ b/projects/settings_vs80.vcproj
@@ -1,87 +0,0 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="settings"
 	ProjectGUID="{0817F629-589E-4A3B-B81A-8647BC571E35}"
 	RootNamespace="settings"
 	>
 	<Platforms>
 		<Platform
 			Name="Win32"
 		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="..\objs\settings\table"
 			IntermediateDirectory="..\objs\settings\table"
 			ConfigurationType="10"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="Generating settings.h"
 				CommandLine="
 ..\objs\settings\settings_gen.exe -o ..\objs\settings\table\settings.h -b ..\src\table\settings.h.preamble -a ..\src\table\settings.h.postamble ..\src\table\company_settings.ini ..\src\table\currency_settings.ini ..\src\table\gameopt_settings.ini ..\src\table\misc_settings.ini ..\src\table\settings.ini ..\src\table\win32_settings.ini ..\src\table\window_settings.ini
 				"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
 				Name="VCMIDLTool"
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 	</Configurations>
 	<References>
 	</References>
 	<Files>
 		<Filter
 			Name="INI"
 			>
 		<File
 			RelativePath="..\src\table\company_settings.ini"
 			>
 		</File>
 		<File
 			RelativePath="..\src\table\currency_settings.ini"
 			>
 		</File>
 		<File
 			RelativePath="..\src\table\gameopt_settings.ini"
 			>
 		</File>
 		<File
 			RelativePath="..\src\table\misc_settings.ini"
 			>
 		</File>
 		<File
 			RelativePath="..\src\table\settings.ini"
 			>
 		</File>
 		<File
 			RelativePath="..\src\table\win32_settings.ini"
 			>
 		</File>
 		<File
 			RelativePath="..\src\table\window_settings.ini"
 			>
 		</File>
 		</Filter>
 		<File
 			RelativePath="..\src\table\settings.h.postamble"
 			>
 		</File>
 		<File
 			RelativePath="..\src\table\settings.h.preamble"
 			>
 		</File>
 	</Files>
 	<Globals>
 	</Globals>
 </VisualStudioProject>
--- a/projects/settings_vs80.vcproj.in
+++ b/projects/settings_vs80.vcproj.in
@@ -1,60 +0,0 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="settings"
 	ProjectGUID="{0817F629-589E-4A3B-B81A-8647BC571E35}"
 	RootNamespace="settings"
 	>
 	<Platforms>
 		<Platform
 			Name="Win32"
 		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="..\objs\settings\table"
 			IntermediateDirectory="..\objs\settings\table"
 			ConfigurationType="10"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="Generating settings.h"
 				CommandLine="
 !!FILTERS!!
 				"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
 				Name="VCMIDLTool"
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 	</Configurations>
 	<References>
 	</References>
 	<Files>
 		<Filter
 			Name="INI"
 			>
 !!FILES!!
 		</Filter>
 		<File
 			RelativePath="..\src\table\settings.h.postamble"
 			>
 		</File>
 		<File
 			RelativePath="..\src\table\settings.h.preamble"
 			>
 		</File>
 	</Files>
 	<Globals>
 	</Globals>
 </VisualStudioProject>
--- a/projects/settings_vs90.vcproj
+++ b/projects/settings_vs90.vcproj
@@ -1,88 +0,0 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9.00"
 	Name="settings"
 	ProjectGUID="{0817F629-589E-4A3B-B81A-8647BC571E35}"
 	RootNamespace="settings"
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
 			Name="Win32"
 		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="..\objs\settings\table"
 			IntermediateDirectory="..\objs\settings\table"
 			ConfigurationType="10"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="Generating settings.h"
 				CommandLine="
 ..\objs\settings\settings_gen.exe -o ..\objs\settings\table\settings.h -b ..\src\table\settings.h.preamble -a ..\src\table\settings.h.postamble ..\src\table\company_settings.ini ..\src\table\currency_settings.ini ..\src\table\gameopt_settings.ini ..\src\table\misc_settings.ini ..\src\table\settings.ini ..\src\table\win32_settings.ini ..\src\table\window_settings.ini
 				"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
 				Name="VCMIDLTool"
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 	</Configurations>
 	<References>
 	</References>
 	<Files>
 		<Filter
 			Name="INI"
 			>
 		<File
 			RelativePath="..\src\table\company_settings.ini"
 			>
 		</File>
 		<File
 			RelativePath="..\src\table\currency_settings.ini"
 			>
 		</File>
 		<File
 			RelativePath="..\src\table\gameopt_settings.ini"
 			>
 		</File>
 		<File
 			RelativePath="..\src\table\misc_settings.ini"
 			>
 		</File>
 		<File
 			RelativePath="..\src\table\settings.ini"
 			>
 		</File>
 		<File
 			RelativePath="..\src\table\win32_settings.ini"
 			>
 		</File>
 		<File
 			RelativePath="..\src\table\window_settings.ini"
 			>
 		</File>
 		</Filter>
 		<File
 			RelativePath="..\src\table\settings.h.postamble"
 			>
 		</File>
 		<File
 			RelativePath="..\src\table\settings.h.preamble"
 			>
 		</File>
 	</Files>
 	<Globals>
 	</Globals>
 </VisualStudioProject>
--- a/projects/settings_vs90.vcproj.in
+++ b/projects/settings_vs90.vcproj.in
@@ -1,61 +0,0 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9.00"
 	Name="settings"
 	ProjectGUID="{0817F629-589E-4A3B-B81A-8647BC571E35}"
 	RootNamespace="settings"
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
 			Name="Win32"
 		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="..\objs\settings\table"
 			IntermediateDirectory="..\objs\settings\table"
 			ConfigurationType="10"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="Generating settings.h"
 				CommandLine="
 !!FILTERS!!
 				"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
 				Name="VCMIDLTool"
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 	</Configurations>
 	<References>
 	</References>
 	<Files>
 		<Filter
 			Name="INI"
 			>
 !!FILES!!
 		</Filter>
 		<File
 			RelativePath="..\src\table\settings.h.postamble"
 			>
 		</File>
 		<File
 			RelativePath="..\src\table\settings.h.preamble"
 			>
 		</File>
 	</Files>
 	<Globals>
 	</Globals>
 </VisualStudioProject>
--- a/projects/settingsgen_vs100.vcxproj
+++ b/projects/settingsgen_vs100.vcxproj
@@ -1,81 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectName>settingsgen</ProjectName>
    <ProjectGuid>{E9548DE9-F089-49B7-93A6-30BE2CC311C7}</ProjectGuid>
    <RootNamespace>settings</RootNamespace>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup>
    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\settings\</OutDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\objs\settings\</IntDir>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">settings_gen</TargetName>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <PreBuildEvent>
      <Command>
      </Command>
    </PreBuildEvent>
    <CustomBuildStep>
      <Inputs>%(Inputs)</Inputs>
    </CustomBuildStep>
    <ClCompile>
      <Optimization>MinSpace</Optimization>
      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
      <PreprocessorDefinitions>SETTINGSGEN;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AssemblerOutput>All</AssemblerOutput>
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <TreatWarningAsError>true</TreatWarningAsError>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    </ClCompile>
    <Link>
      <OutputFile>$(OutDir)settings_gen.exe</OutputFile>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <RandomizedBaseAddress>false</RandomizedBaseAddress>
      <DataExecutionPrevention>
      </DataExecutionPrevention>
      <SubSystem>Console</SubSystem>
    </Link>
    <PostBuildEvent>
      <Command>
      </Command>
    </PostBuildEvent>
  </ItemDefinitionGroup>
  <ItemGroup>
    <ClCompile Include="..\src\core\alloc_func.cpp" />
    <ClCompile Include="..\src\misc\getoptdata.cpp" />
    <ClCompile Include="..\src\ini_load.cpp" />
    <ClCompile Include="..\src\settingsgen\settingsgen.cpp" />
    <ClCompile Include="..\src\string.cpp" />
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\src\misc\getoptdata.h" />
    <ClInclude Include="..\src\ini_type.h" />
    <ClInclude Include="..\src\core\smallvec_type.hpp" />
    <ClInclude Include="..\src\string_func.h" />
    <ClInclude Include="..\src\strings_type.h" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
 </Project>
--- a/projects/settingsgen_vs100.vcxproj.filters
+++ b/projects/settingsgen_vs100.vcxproj.filters
@@ -1,32 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="Source Files">
      <UniqueIdentifier>{a4678737-b3b3-4be5-9db1-fa6ccd164c59}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="..\src\core\alloc_func.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
    <ClCompile Include="..\src\misc\getoptdata.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
    <ClCompile Include="..\src\ini_load.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
    <ClCompile Include="..\src\settingsgen\settingsgen.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
    <ClCompile Include="..\src\string.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\src\misc\getoptdata.h" />
    <ClInclude Include="..\src\ini_type.h" />
    <ClInclude Include="..\src\core\smallvec_type.hpp" />
    <ClInclude Include="..\src\string_func.h" />
    <ClInclude Include="..\src\strings_type.h" />
  </ItemGroup>
 </Project>
--- a/projects/settingsgen_vs80.vcproj
+++ b/projects/settingsgen_vs80.vcproj
@@ -1,143 +0,0 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8,00"
 	Name="settings_gen"
 	ProjectGUID="{E9548DE9-F089-49B7-93A6-30BE2CC311C7}"
 	RootNamespace="settings"
 	>
 	<Platforms>
 		<Platform
 			Name="Win32"
 		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="..\objs\settings"
 			IntermediateDirectory="..\objs\settings"
 			ConfigurationType="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 				CommandLine=""
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 				AdditionalDependencies=""
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
 			/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
 			<Tool
 				Name="VCMIDLTool"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="1"
 				FavorSizeOrSpeed="2"
 				PreprocessorDefinitions="SETTINGSGEN;WIN32;_DEBUG;_CONSOLE"
 				AssemblerOutput="2"
 				ProgramDataBaseFileName="$(IntDir)\$(TargetName).pdb"
 				WarningLevel="3"
 				WarnAsError="true"
 				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
 				OutputFile="$(OutDir)\settings_gen.exe"
 				GenerateDebugInformation="true"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
 			<Tool
 				Name="VCManifestTool"
 			/>
 			<Tool
 				Name="VCXDCMakeTool"
 			/>
 			<Tool
 				Name="VCBscMakeTool"
 			/>
 			<Tool
 				Name="VCFxCopTool"
 			/>
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
 				Name="VCWebDeploymentTool"
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description=""
 				CommandLine=""
 			/>
 		</Configuration>
 	</Configurations>
 	<References>
 	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
 			>
 			<File
 				RelativePath="..\src\core\alloc_func.cpp"
 				>
 			</File>
 			<File
 				RelativePath="..\src\misc\getoptdata.cpp"
 				>
 			</File>
 			<File
 				RelativePath="..\src\ini_load.cpp"
 				>
 			</File>
 			<File
 				RelativePath="..\src\settingsgen\settingsgen.cpp"
 				>
 			</File>
 			<File
 				RelativePath="..\src\string.cpp"
 				>
 			</File>
 		</Filter>
 		<File
 			RelativePath="..\src\misc\getoptdata.h"
 			>
 		</File>
 		<File
 			RelativePath="..\src\ini_type.h"
 			>
 		</File>
 		<File
 			RelativePath="..\src\core\smallvec_type.hpp"
 			>
 		</File>
 		<File
 			RelativePath="..\src\string_func.h"
 			>
 		</File>
 		<File
 			RelativePath="..\src\strings_type.h"
 			>
 		</File>
 	</Files>
 	<Globals>
 	</Globals>
 </VisualStudioProject>
--- a/projects/settingsgen_vs90.vcproj
+++ b/projects/settingsgen_vs90.vcproj
@@ -1,142 +0,0 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9,00"
 	Name="settingsgen"
 	ProjectGUID="{E9548DE9-F089-49B7-93A6-30BE2CC311C7}"
 	RootNamespace="settings"
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
 			Name="Win32"
 		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="..\objs\settings"
 			IntermediateDirectory="..\objs\settings"
 			ConfigurationType="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 				CommandLine=""
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 				AdditionalDependencies=""
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
 			/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
 			<Tool
 				Name="VCMIDLTool"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="1"
 				FavorSizeOrSpeed="2"
 				PreprocessorDefinitions="SETTINGSGEN;WIN32;_DEBUG;_CONSOLE"
 				AssemblerOutput="2"
 				ProgramDataBaseFileName="$(IntDir)\$(TargetName).pdb"
 				WarningLevel="3"
 				WarnAsError="true"
 				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
 				OutputFile="$(OutDir)\settings_gen.exe"
 				GenerateDebugInformation="true"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
 			<Tool
 				Name="VCManifestTool"
 			/>
 			<Tool
 				Name="VCXDCMakeTool"
 			/>
 			<Tool
 				Name="VCBscMakeTool"
 			/>
 			<Tool
 				Name="VCFxCopTool"
 			/>
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 				CommandLine=""
 			/>
 		</Configuration>
 	</Configurations>
 	<References>
 	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
 			>
 			<File
 				RelativePath="..\src\core\alloc_func.cpp"
 				>
 			</File>
 			<File
 				RelativePath="..\src\misc\getoptdata.cpp"
 				>
 			</File>
 			<File
 				RelativePath="..\src\ini_load.cpp"
 				>
 			</File>
 			<File
 				RelativePath="..\src\settingsgen\settingsgen.cpp"
 				>
 			</File>
 			<File
 				RelativePath="..\src\string.cpp"
 				>
 			</File>
 		</Filter>
 		<File
 			RelativePath="..\src\misc\getoptdata.h"
 			>
 		</File>
 		<File
 			RelativePath="..\src\ini_type.h"
 			>
 		</File>
 		<File
 			RelativePath="..\src\core\smallvec_type.hpp"
 			>
 		</File>
 		<File
 			RelativePath="..\src\string_func.h"
 			>
 		</File>
 		<File
 			RelativePath="..\src\strings_type.h"
 			>
 		</File>
 	</Files>
 	<Globals>
 	</Globals>
 </VisualStudioProject>
--- a/projects/strgen_vs100.vcxproj
+++ b/projects/strgen_vs100.vcxproj
@@ -1,94 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectName>strgen</ProjectName>
    <ProjectGuid>{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}</ProjectGuid>
    <RootNamespace>strgen</RootNamespace>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseOfMfc>false</UseOfMfc>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup>
    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\objs\strgen\</OutDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\objs\strgen\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <Midl>
      <TypeLibraryName>.\Debug/strgen.tlb</TypeLibraryName>
      <HeaderFileName>
      </HeaderFileName>
    </Midl>
    <ClCompile>
      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
      <Optimization>MinSpace</Optimization>
      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
      <PreprocessorDefinitions>STRGEN;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <PrecompiledHeaderOutputFile>
      </PrecompiledHeaderOutputFile>
      <AssemblerOutput>All</AssemblerOutput>
      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
      <ObjectFileName>$(IntDir)</ObjectFileName>
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <TreatWarningAsError>true</TreatWarningAsError>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    </ClCompile>
    <ResourceCompile>
      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Culture>0x041d</Culture>
    </ResourceCompile>
    <Link>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>$(IntDir)strgen.pdb</ProgramDatabaseFile>
      <SubSystem>Console</SubSystem>
      <RandomizedBaseAddress>false</RandomizedBaseAddress>
      <DataExecutionPrevention>
      </DataExecutionPrevention>
      <TargetMachine>MachineX86</TargetMachine>
    </Link>
  </ItemDefinitionGroup>
  <ItemGroup>
    <ClCompile Include="..\src\core\alloc_func.cpp" />
    <ClCompile Include="..\src\strgen\strgen_base.cpp" />
    <ClCompile Include="..\src\strgen\strgen.cpp" />
    <ClCompile Include="..\src\string.cpp" />
    <ClCompile Include="..\src\misc\getoptdata.cpp" />
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\src\core\alloc_func.hpp" />
    <ClInclude Include="..\src\table\control_codes.h" />
    <ClInclude Include="..\src\debug.h" />
    <ClInclude Include="..\src\core\endian_func.hpp" />
    <ClInclude Include="..\src\stdafx.h" />
    <ClInclude Include="..\src\string_func.h" />
    <ClInclude Include="..\src\misc\getoptdata.h" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
 </Project>
--- a/projects/strgen_vs100.vcxproj.filters
+++ b/projects/strgen_vs100.vcxproj.filters
@@ -1,35 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="Source Files">
      <UniqueIdentifier>{5894294c-d4dc-41f0-be31-e56cff4e0405}</UniqueIdentifier>
      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
    </Filter>
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="..\src\core\alloc_func.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
    <ClCompile Include="..\src\strgen\strgen_base.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
    <ClCompile Include="..\src\strgen\strgen.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
    <ClCompile Include="..\src\string.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
    <ClCompile Include="..\src\misc\getoptdata.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\src\core\alloc_func.hpp" />
    <ClInclude Include="..\src\table\control_codes.h" />
    <ClInclude Include="..\src\debug.h" />
    <ClInclude Include="..\src\core\endian_func.hpp" />
    <ClInclude Include="..\src\stdafx.h" />
    <ClInclude Include="..\src\string_func.h" />
    <ClInclude Include="..\src\misc\getoptdata.h" />
  </ItemGroup>
 </Project>
--- a/projects/strgen_vs80.vcproj
+++ b/projects/strgen_vs80.vcproj
@@ -1,168 +0,0 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="strgen"
 	ProjectGUID="{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}"
 	RootNamespace="strgen"
 	>
 	<Platforms>
 		<Platform
 			Name="Win32"
 		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="..\objs\strgen"
 			IntermediateDirectory="..\objs\strgen"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
 			/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
 			<Tool
 				Name="VCMIDLTool"
 				TypeLibraryName=".\Debug/strgen.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="1"
 				FavorSizeOrSpeed="2"
 				PreprocessorDefinitions="STRGEN;WIN32;_DEBUG;_CONSOLE"
 				BasicRuntimeChecks="0"
 				RuntimeLibrary="1"
 				PrecompiledHeaderFile=""
 				AssemblerOutput="2"
 				AssemblerListingLocation="$(IntDir)/"
 				ObjectFile="$(IntDir)/"
 				ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"
 				WarningLevel="3"
 				WarnAsError="true"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1053"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
 				OutputFile="$(IntDir)\strgen.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(IntDir)\strgen.pdb"
 				SubSystem="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>
 	</Configurations>
 	<References>
 	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
 			<File
 				RelativePath="..\src\core\alloc_func.cpp"
 				>
 			</File>
 			<File
 				RelativePath="..\src\strgen\strgen_base.cpp"
 				>
 			</File>
 			<File
 				RelativePath="..\src\strgen\strgen.cpp"
 				>
 			</File>
 			<File
 				RelativePath="..\src\string.cpp"
 				>
 			</File>
 			<File
 				RelativePath="..\src\misc\getoptdata.cpp"
 				>
 			</File>
 		</Filter>
 		<File
 			RelativePath="..\src\core\alloc_func.hpp"
 			>
 		</File>
 		<File
 			RelativePath="..\src\table\control_codes.h"
 			>
 		</File>
 		<File
 			RelativePath="..\src\debug.h"
 			>
 		</File>
 		<File
 			RelativePath="..\src\core\endian_func.hpp"
 			>
 		</File>
 		<File
 			RelativePath="..\src\stdafx.h"
 			>
 		</File>
 		<File
 			RelativePath="..\src\string_func.h"
 			>
 		</File>
 		<File
 			RelativePath="..\src\misc\getoptdata.h"
 			>
 		</File>
 	</Files>
 	<Globals>
 	</Globals>
 </VisualStudioProject>
--- a/projects/strgen_vs90.vcproj
+++ b/projects/strgen_vs90.vcproj
@@ -1,168 +0,0 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9.00"
 	Name="strgen"
 	ProjectGUID="{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}"
 	RootNamespace="strgen"
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
 			Name="Win32"
 		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="..\objs\strgen"
 			IntermediateDirectory="..\objs\strgen"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
 			/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
 			<Tool
 				Name="VCMIDLTool"
 				TypeLibraryName=".\Debug/strgen.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="1"
 				FavorSizeOrSpeed="2"
 				PreprocessorDefinitions="STRGEN;WIN32;_DEBUG;_CONSOLE"
 				BasicRuntimeChecks="0"
 				RuntimeLibrary="1"
 				PrecompiledHeaderFile=""
 				AssemblerOutput="2"
 				AssemblerListingLocation="$(IntDir)/"
 				ObjectFile="$(IntDir)/"
 				ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"
 				WarningLevel="3"
 				WarnAsError="true"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1053"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
 				OutputFile="$(IntDir)\strgen.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(IntDir)\strgen.pdb"
 				SubSystem="1"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
 			<Tool
 				Name="VCManifestTool"
 			/>
 			<Tool
 				Name="VCXDCMakeTool"
 			/>
 			<Tool
 				Name="VCBscMakeTool"
 			/>
 			<Tool
 				Name="VCFxCopTool"
 			/>
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 	</Configurations>
 	<References>
 	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
 			<File
 				RelativePath="..\src\core\alloc_func.cpp"
 				>
 			</File>
 			<File
 				RelativePath="..\src\strgen\strgen_base.cpp"
 				>
 			</File>
 			<File
 				RelativePath="..\src\strgen\strgen.cpp"
 				>
 			</File>
 			<File
 				RelativePath="..\src\string.cpp"
 				>
 			</File>
 			<File
 				RelativePath="..\src\misc\getoptdata.cpp"
 				>
 			</File>
 		</Filter>
 		<File
 			RelativePath="..\src\core\alloc_func.hpp"
 			>
 		</File>
 		<File
 			RelativePath="..\src\table\control_codes.h"
 			>
 		</File>
 		<File
 			RelativePath="..\src\debug.h"
 			>
 		</File>
 		<File
 			RelativePath="..\src\core\endian_func.hpp"
 			>
 		</File>
 		<File
 			RelativePath="..\src\stdafx.h"
 			>
 		</File>
 		<File
 			RelativePath="..\src\string_func.h"
 			>
 		</File>
 		<File
 			RelativePath="..\src\misc\getoptdata.h"
 			>
 		</File>
 	</Files>
 	<Globals>
 	</Globals>
 </VisualStudioProject>
--- a/projects/version_vs100.vcxproj
+++ b/projects/version_vs100.vcxproj
@@ -1,42 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectName>version</ProjectName>
    <ProjectGuid>{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}</ProjectGuid>
    <RootNamespace>version</RootNamespace>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Makefile</ConfigurationType>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup>
    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\objs\version\</OutDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\objs\version\</IntDir>
    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cscript "$(ProjectDir)/determineversion.vbs"</NMakeBuildCommandLine>
    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cscript "$(ProjectDir)/determineversion.vbs"</NMakeReBuildCommandLine>
    <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\src\rev.cpp</NMakeOutput>
    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">del ..\src\rev.cpp</NMakeCleanCommandLine>
  </PropertyGroup>
  <ItemGroup>
    <None Include="..\src\os\windows\ottdres.rc.in" />
    <None Include="..\src\rev.cpp.in" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
 </Project>
--- a/projects/version_vs80.vcproj
+++ b/projects/version_vs80.vcproj
@@ -1,48 +0,0 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="version"
 	ProjectGUID="{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}"
 	RootNamespace="version"
 	>
 	<Platforms>
 		<Platform
 			Name="Win32"
 		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="10"
 			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="Determining version number"
 				CommandLine="cscript &quot;$(InputDir)/determineversion.vbs&quot;"
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 	</Configurations>
 	<References>
 	</References>
 	<Files>
 		<File
 			RelativePath="..\src\os\windows\ottdres.rc.in"
 			>
 		</File>
 		<File
 			RelativePath="..\src\rev.cpp.in"
 			>
 		</File>
 	</Files>
 	<Globals>
 	</Globals>
 </VisualStudioProject>
--- a/projects/version_vs90.vcproj
+++ b/projects/version_vs90.vcproj
@@ -1,49 +0,0 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9.00"
 	Name="version"
 	ProjectGUID="{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}"
 	RootNamespace="version"
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
 			Name="Win32"
 		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="10"
 			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="Determining version number"
 				CommandLine="cscript &quot;$(InputDir)/determineversion.vbs&quot;"
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 	</Configurations>
 	<References>
 	</References>
 	<Files>
 		<File
 			RelativePath="..\src\os\windows\ottdres.rc.in"
 			>
 		</File>
 		<File
 			RelativePath="..\src\rev.cpp.in"
 			>
 		</File>
 	</Files>
 	<Globals>
 	</Globals>
 </VisualStudioProject>
--- a/source.list
+++ b/source.list
@@ -95,22 +95,19 @@ tilearea.cpp
 townname.cpp
 #if WIN32
 #else
-	#if WINCE
+	#if OS2
 		os/os2/os2.cpp
 		3rdparty/os2/getaddrinfo.c
 		3rdparty/os2/getaddrinfo.h
 		3rdparty/os2/getnameinfo.c
 		3rdparty/os2/getnameinfo.h
 	#else
-		#if OS2
+		#if OSX
-			os/os2/os2.cpp
+			os/macosx/crashlog_osx.cpp
 			3rdparty/os2/getaddrinfo.c
 			3rdparty/os2/getaddrinfo.h
 			3rdparty/os2/getnameinfo.c
 			3rdparty/os2/getnameinfo.h
 		#else
-			#if OSX
+			os/unix/crashlog_unix.cpp
 				os/macosx/crashlog_osx.cpp
 			#else
 				os/unix/crashlog_unix.cpp
 			#end
 			os/unix/unix.cpp
 		#end
 		os/unix/unix.cpp
 	#end
 #end
 vehicle.cpp
@@ -196,6 +193,7 @@ fileio_type.h
 fios.h
 fontcache.h
 fontdetection.h
 framerate_type.h
 base_consist.h
 gamelog.h
 gamelog_internal.h
@@ -284,6 +282,8 @@ newgrf_townname.h
 news_func.h
 news_gui.h
 news_type.h
 music/midi.h
 music/midifile.hpp
 music/null_m.h
 sound/null_s.h
 video/null_v.h
@@ -345,6 +345,7 @@ strgen/strgen.h
 string_base.h
 string_func.h
 string_type.h
 os/windows/string_uniscribe.h
 stringfilter_type.h
 strings_func.h
 strings_type.h
@@ -398,6 +399,7 @@ video/win32_v.h
 window_func.h
 window_gui.h
 window_type.h
 sound/xaudio2_s.h
 zoom_func.h
 zoom_type.h
 #if WIN32
@@ -406,11 +408,13 @@ music/bemidi.h
 music/cocoa_m.h
 music/extmidi.h
 music/libtimidity.h
 music/fluidsynth.h
 music/os2_m.h
 music/qtmidi.h
 os/macosx/macos.h
 os/macosx/osx_stdafx.h
 os/macosx/splash.h
 os/macosx/string_osx.h
 sound/cocoa_s.h
 video/cocoa/cocoa_keys.h
 video/cocoa/cocoa_v.h
@@ -464,6 +468,7 @@ dock_gui.cpp
 engine_gui.cpp
 error_gui.cpp
 fios_gui.cpp
 framerate_gui.cpp
 genworld_gui.cpp
 goal_gui.cpp
 graph_gui.cpp
@@ -527,6 +532,7 @@ widgets/dropdown_widget.h
 widgets/engine_widget.h
 widgets/error_widget.h
 widgets/fios_widget.h
 widgets/framerate_widget.h
 widgets/genworld_widget.h
 widgets/goal_widget.h
 widgets/graph_widget.h
@@ -916,6 +922,8 @@ script/api/script_window.cpp
 blitter/32bpp_anim.cpp
 blitter/32bpp_anim.hpp
 #if SSE
 blitter/32bpp_anim_sse2.cpp
 blitter/32bpp_anim_sse2.hpp
 blitter/32bpp_anim_sse4.cpp
 blitter/32bpp_anim_sse4.hpp
 #end
@@ -1091,9 +1099,6 @@ video/null_v.cpp
 #if WIN32
 	video/win32_v.cpp
 #end
 #if WINCE
 	video/win32_v.cpp
 #end
 #end
 # Music
@@ -1107,22 +1112,17 @@ video/null_v.cpp
 #end
 #end
 music/null_m.cpp
 music/midifile.cpp
 #if DEDICATED
 #else
 #if WIN32
 	music/win32_m.cpp
 #else
-	#if WINCE
+	#if DOS
 	#else
-		#if PSP
+		#if MORPHOS
 		#else
-			#if DOS
+			music/extmidi.cpp
 			#else
 				#if MORPHOS
 				#else
 					music/extmidi.cpp
 				#end
 			#end
 		#end
 	#end
 #end
@@ -1132,6 +1132,9 @@ music/null_m.cpp
 #if LIBTIMIDITY
 	music/libtimidity.cpp
 #end
 #if FLUIDSYNTH
 	music/fluidsynth.cpp
 #end
 #end
 # Sound
@@ -1146,6 +1149,7 @@ sound/null_s.cpp
 #end
 #if WIN32
 	sound/win32_s.cpp
 	sound/xaudio2_s.cpp
 #end
 #end
@@ -1167,6 +1171,7 @@ sound/null_s.cpp
 		music/cocoa_m.cpp
 		sound/cocoa_s.cpp
 		os/macosx/splash.cpp
 		os/macosx/string_osx.cpp
 	#end
 #end
@@ -1174,10 +1179,7 @@ sound/null_s.cpp
 #if WIN32
 	os/windows/crashlog_win.cpp
 	os/windows/ottdres.rc
-	os/windows/win32.cpp
+	os/windows/string_uniscribe.cpp
 #end
 #if WINCE
 	os/windows/ottdres.rc
 	os/windows/win32.cpp
 #end
--- a/src/3rdparty/squirrel/squirrel/sqdebug.cpp
+++ b/src/3rdparty/squirrel/squirrel/sqdebug.cpp
@@ -115,7 +115,7 @@ void SQVM::Raise_ParamTypeError(SQInteger nparam,SQInteger typemask,SQInteger ty
 	SQInteger found = 0;
 	for(SQInteger i=0; i<16; i++)
 	{
-		SQInteger mask = 0x00000001 << i;
+		SQInteger mask = 0x00000001LL << i;
 		if(typemask & (mask)) {
 			if(found>0) StringCat(exptypes,SQString::Create(_ss(this), "|", -1), exptypes);
 			found ++;
--- a/src/3rdparty/squirrel/squirrel/squtils.h
+++ b/src/3rdparty/squirrel/squirrel/squtils.h
@@ -90,7 +90,7 @@ public:
 	{
 		_vals[idx].~T();
 		if(idx < (_size - 1)) {
-			memmove(&_vals[idx], &_vals[idx+1], sizeof(T) * (_size - (size_t)idx - 1));
+			memmove(static_cast<void *>(&_vals[idx]), &_vals[idx+1], sizeof(T) * (_size - (size_t)idx - 1));
 		}
 		_size--;
 	}
--- a/src/3rdparty/squirrel/squirrel/sqvm.cpp
+++ b/src/3rdparty/squirrel/squirrel/sqvm.cpp
@@ -378,8 +378,7 @@ bool SQVM::StartCall(SQClosure *closure,SQInteger target,SQInteger args,SQIntege
 	}
 	if (!tailcall) {
-		CallInfo lc;
+		CallInfo lc = {};
 		memset(&lc, 0, sizeof(lc));
 		lc._generator = NULL;
 		lc._etraps = 0;
 		lc._prevstkbase = (SQInt32) ( stackbase - _stackbase );
@@ -1159,8 +1158,7 @@ bool SQVM::CallNative(SQNativeClosure *nclosure,SQInteger nargs,SQInteger stackb
 	SQInteger oldtop = _top;
 	SQInteger oldstackbase = _stackbase;
 	_top = stackbase + nargs;
-	CallInfo lci;
+	CallInfo lci = {};
 	memset(&lci, 0, sizeof(lci));
 	lci._closure = nclosure;
 	lci._generator = NULL;
 	lci._etraps = 0;
--- a/src/ai/ai_info.cpp
+++ b/src/ai/ai_info.cpp
@@ -32,9 +32,9 @@ static bool CheckAPIVersion(const char *api_version)
 			strcmp(api_version, "1.8") == 0 || strcmp(api_version, "1.9") == 0;
 }
-#if defined(WIN32)
+#if defined(_WIN32)
 #undef GetClassName
-#endif /* WIN32 */
+#endif /* _WIN32 */
 template <> const char *GetClassName<AIInfo, ST_AI>() { return "AIInfo"; }
 /* static */ void AIInfo::RegisterAPI(Squirrel *engine)
--- a/src/aircraft.h
+++ b/src/aircraft.h
@@ -45,6 +45,8 @@ enum AirVehicleFlags {
 	 * landscape at a fixed altitude. This only has effect when there are more than 15 height levels. */
 	VAF_IN_MAX_HEIGHT_CORRECTION = 1, ///< The vehicle is currently lowering its altitude because it hit the upper bound.
 	VAF_IN_MIN_HEIGHT_CORRECTION = 2, ///< The vehicle is currently raising its altitude because it hit the lower bound.
 	VAF_HELI_DIRECT_DESCENT      = 3, ///< The helicopter is descending directly at its destination (helipad or in front of hangar)
 };
 static const int ROTOR_Z_OFFSET         = 5;    ///< Z Offset between helicopter- and rotorsprite.
@@ -90,7 +92,7 @@ struct Aircraft FINAL : public SpecializedVehicle<Aircraft, VEH_AIRCRAFT> {
 	virtual ~Aircraft() { this->PreDestructor(); }
 	void MarkDirty();
-	void UpdateDeltaXY(Direction direction);
+	void UpdateDeltaXY();
 	ExpensesType GetExpenseType(bool income) const { return income ? EXPENSES_AIRCRAFT_INC : EXPENSES_AIRCRAFT_RUN; }
 	bool IsPrimaryVehicle() const                  { return this->IsNormalAircraft(); }
 	void GetImage(Direction direction, EngineImageType image_type, VehicleSpriteSeq *result) const;
@@ -137,7 +139,7 @@ struct Aircraft FINAL : public SpecializedVehicle<Aircraft, VEH_AIRCRAFT> {
 };
 /**
- * Macro for iterating over all aircrafts.
+ * Macro for iterating over all aircraft.
 */
 #define FOR_ALL_AIRCRAFT(var) FOR_ALL_VEHICLES_OF_TYPE(Aircraft, var)
--- a/src/aircraft_cmd.cpp
+++ b/src/aircraft_cmd.cpp
@@ -37,12 +37,13 @@
 #include "core/backup_type.hpp"
 #include "zoom_func.h"
 #include "disaster_vehicle.h"
 #include "framerate_type.h"
 #include "table/strings.h"
 #include "safeguards.h"
-void Aircraft::UpdateDeltaXY(Direction direction)
+void Aircraft::UpdateDeltaXY()
 {
 	this->x_offs = -1;
 	this->y_offs = -1;
@@ -247,7 +248,7 @@ void GetAircraftSpriteSize(EngineID engine, uint &width, uint &height, int &xoff
 * @param flags    type of operation.
 * @param e        the engine to build.
 * @param data     unused.
- * @param ret[out] the vehicle that has been built.
+ * @param[out] ret the vehicle that has been built.
 * @return the cost of this operation or an error.
 */
 CommandCost CmdBuildAircraft(TileIndex tile, DoCommandFlag flags, const Engine *e, uint16 data, Vehicle **ret)
@@ -303,10 +304,10 @@ CommandCost CmdBuildAircraft(TileIndex tile, DoCommandFlag flags, const Engine *
 		u->engine_type = e->index;
 		v->subtype = (avi->subtype & AIR_CTOL ? AIR_AIRCRAFT : AIR_HELICOPTER);
-		v->UpdateDeltaXY(INVALID_DIR);
+		v->UpdateDeltaXY();
 		u->subtype = AIR_SHADOW;
-		u->UpdateDeltaXY(INVALID_DIR);
+		u->UpdateDeltaXY();
 		v->reliability = e->reliability;
 		v->reliability_spd_dec = e->reliability_spd_dec;
@@ -363,7 +364,7 @@ CommandCost CmdBuildAircraft(TileIndex tile, DoCommandFlag flags, const Engine *
 			w->random_bits = VehicleRandomBits();
 			/* Use rotor's air.state to store the rotor animation frame */
 			w->state = HRS_ROTOR_STOPPED;
-			w->UpdateDeltaXY(INVALID_DIR);
+			w->UpdateDeltaXY();
 			u->SetNext(w);
 			w->UpdatePosition();
@@ -634,6 +635,12 @@ static int UpdateAircraftSpeed(Aircraft *v, uint speed_limit = SPEED_LIMIT_NONE,
 	 * and take-off speeds being too low. */
 	speed_limit *= _settings_game.vehicle.plane_speed;
 	/* adjust speed for broken vehicles */
 	if (v->vehstatus & VS_AIRCRAFT_BROKEN) {
 		if (SPEED_LIMIT_BROKEN < speed_limit) hard_limit = false;
 		speed_limit = min(speed_limit, SPEED_LIMIT_BROKEN);
 	}
 	if (v->vcache.cached_max_speed < speed_limit) {
 		if (v->cur_speed < speed_limit) hard_limit = false;
 		speed_limit = v->vcache.cached_max_speed;
@@ -653,9 +660,6 @@ static int UpdateAircraftSpeed(Aircraft *v, uint speed_limit = SPEED_LIMIT_NONE,
 	spd = min(v->cur_speed + (spd >> 8) + (v->subspeed < t), speed_limit);
 	/* adjust speed for broken vehicles */
 	if (v->vehstatus & VS_AIRCRAFT_BROKEN) spd = min(spd, SPEED_LIMIT_BROKEN);
 	/* updates statusbar only if speed have changed to save CPU time */
 	if (spd != v->cur_speed) {
 		v->cur_speed = spd;
@@ -693,9 +697,9 @@ int GetTileHeightBelowAircraft(const Vehicle *v)
 * When the maximum is reached the vehicle should consider descending.
 * When the minimum is reached the vehicle should consider ascending.
 *
- * @param v               The vehicle to get the flight levels for.
+ * @param v              The vehicle to get the flight levels for.
- * @param [out] min_level The minimum bounds for flight level.
+ * @param[out] min_level The minimum bounds for flight level.
- * @param [out] max_level The maximum bounds for flight level.
+ * @param[out] max_level The maximum bounds for flight level.
 */
 void GetAircraftFlightLevelBounds(const Vehicle *v, int *min_level, int *max_level)
 {
@@ -727,7 +731,7 @@ void GetAircraftFlightLevelBounds(const Vehicle *v, int *min_level, int *max_lev
 /**
 * Gets the maximum 'flight level' for the holding pattern of the aircraft,
- * in pixels 'z_pos' 0, depending on terrain below..
+ * in pixels 'z_pos' 0, depending on terrain below.
 *
 * @param v The aircraft that may or may not need to decrease its altitude.
 * @return Maximal aircraft holding altitude, while in normal flight, in pixels.
@@ -749,7 +753,7 @@ int GetAircraftFlightLevel(T *v, bool takeoff)
 	GetAircraftFlightLevelBounds(v, &aircraft_min_altitude, &aircraft_max_altitude);
 	int aircraft_middle_altitude = (aircraft_min_altitude + aircraft_max_altitude) / 2;
-	/* If those assumptions would be violated, aircrafts would behave fairly strange. */
+	/* If those assumptions would be violated, aircraft would behave fairly strange. */
 	assert(aircraft_min_altitude < aircraft_middle_altitude);
 	assert(aircraft_middle_altitude < aircraft_max_altitude);
@@ -914,6 +918,8 @@ static bool AircraftController(Aircraft *v)
 	/* Helicopter landing. */
 	if (amd.flag & AMED_HELI_LOWER) {
 		SetBit(v->flags, VAF_HELI_DIRECT_DESCENT);
 		if (st == NULL) {
 			/* FIXME - AircraftController -> if station no longer exists, do not land
 			 * helicopter will circle until sign disappears, then go to next order
@@ -934,7 +940,10 @@ static bool AircraftController(Aircraft *v)
 			Vehicle *u = v->Next()->Next();
 			/*  Increase speed of rotors. When speed is 80, we've landed. */
-			if (u->cur_speed >= 80) return true;
+			if (u->cur_speed >= 80) {
 				ClrBit(v->flags, VAF_HELI_DIRECT_DESCENT);
 				return true;
 			}
 			u->cur_speed += 4;
 		} else {
 			count = UpdateAircraftSpeed(v);
@@ -1361,7 +1370,7 @@ static void AircraftEntersTerminal(Aircraft *v)
 */
 static void AircraftLandAirplane(Aircraft *v)
 {
-	v->UpdateDeltaXY(INVALID_DIR);
+	v->UpdateDeltaXY();
 	if (!PlayVehicleSound(v, VSE_TOUCHDOWN)) {
 		SndPlayVehicleFx(SND_17_SKID_PLANE, v);
@@ -1553,7 +1562,7 @@ static void AircraftEventHandler_TakeOff(Aircraft *v, const AirportFTAClass *apc
 static void AircraftEventHandler_StartTakeOff(Aircraft *v, const AirportFTAClass *apc)
 {
 	v->state = ENDTAKEOFF;
-	v->UpdateDeltaXY(INVALID_DIR);
+	v->UpdateDeltaXY();
 }
 static void AircraftEventHandler_EndTakeOff(Aircraft *v, const AirportFTAClass *apc)
@@ -1566,7 +1575,7 @@ static void AircraftEventHandler_EndTakeOff(Aircraft *v, const AirportFTAClass *
 static void AircraftEventHandler_HeliTakeOff(Aircraft *v, const AirportFTAClass *apc)
 {
 	v->state = FLYING;
-	v->UpdateDeltaXY(INVALID_DIR);
+	v->UpdateDeltaXY();
 	/* get the next position to go to, differs per airport */
 	AircraftNextAirportPos_and_Order(v);
@@ -1599,6 +1608,7 @@ static void AircraftEventHandler_Flying(Aircraft *v, const AirportFTAClass *apc)
 				uint16 tsubspeed = v->subspeed;
 				if (!AirportHasBlock(v, current, apc)) {
 					v->state = landingtype; // LANDING / HELILANDING
 					if (v->state == HELILANDING) SetBit(v->flags, VAF_HELI_DIRECT_DESCENT);
 					/* it's a bit dirty, but I need to set position to next position, otherwise
 					 * if there are multiple runways, plane won't know which one it took (because
 					 * they all have heading LANDING). And also occupy that block! */
@@ -1632,7 +1642,7 @@ static void AircraftEventHandler_Landing(Aircraft *v, const AirportFTAClass *apc
 static void AircraftEventHandler_HeliLanding(Aircraft *v, const AirportFTAClass *apc)
 {
 	v->state = HELIENDLANDING;
-	v->UpdateDeltaXY(INVALID_DIR);
+	v->UpdateDeltaXY();
 }
 static void AircraftEventHandler_EndLanding(Aircraft *v, const AirportFTAClass *apc)
@@ -1888,7 +1898,7 @@ static bool FreeTerminal(Aircraft *v, byte i, byte last_terminal)
 /**
 * Get the number of terminals at the airport.
- * @param afc Airport description.
+ * @param apc Airport description.
 * @return Number of terminals.
 */
 static uint GetNumTerminals(const AirportFTAClass *apc)
@@ -2038,6 +2048,8 @@ bool Aircraft::Tick()
 {
 	if (!this->IsNormalAircraft()) return true;
 	PerformanceAccumulator framerate(PFE_GL_AIRCRAFT);
 	this->tick_counter++;
 	if (!(this->vehstatus & VS_STOPPED)) this->running_ticks++;
--- a/src/animated_tile.cpp
+++ b/src/animated_tile.cpp
@@ -14,6 +14,7 @@
 #include "core/smallvec_type.hpp"
 #include "tile_cmd.h"
 #include "viewport_func.h"
 #include "framerate_type.h"
 #include "safeguards.h"
@@ -50,6 +51,8 @@ void AddAnimatedTile(TileIndex tile)
 */
 void AnimateAnimatedTiles()
 {
 	PerformanceAccumulator framerate(PFE_GL_LANDSCAPE);
 	const TileIndex *ti = _animated_tiles.Begin();
 	while (ti < _animated_tiles.End()) {
 		const TileIndex curr = *ti;
--- a/src/articulated_vehicles.cpp
+++ b/src/articulated_vehicles.cpp
@@ -119,12 +119,12 @@ static inline uint16 GetVehicleDefaultCapacity(EngineID engine, CargoID *cargo_t
 * @param include_initial_cargo_type if true the default cargo type of the vehicle is included; if false only the refit_mask
 * @return bit set of CargoIDs
 */
-static inline uint32 GetAvailableVehicleCargoTypes(EngineID engine, bool include_initial_cargo_type)
+static inline CargoTypes GetAvailableVehicleCargoTypes(EngineID engine, bool include_initial_cargo_type)
 {
 	const Engine *e = Engine::Get(engine);
 	if (!e->CanCarryCargo()) return 0;
-	uint32 cargoes = e->info.refit_mask;
+	CargoTypes cargoes = e->info.refit_mask;
 	if (include_initial_cargo_type) {
 		SetBit(cargoes, e->GetDefaultCargoType());
@@ -169,7 +169,7 @@ CargoArray GetCapacityOfArticulatedParts(EngineID engine)
 * @param[out] cargoes Total amount of units that can be transported, summed by cargo.
 * @param[out] refits Whether a (possibly partial) refit for each cargo is possible.
 */
-void GetArticulatedVehicleCargoesAndRefits(EngineID engine, CargoArray *cargoes, uint32 *refits)
+void GetArticulatedVehicleCargoesAndRefits(EngineID engine, CargoArray *cargoes, CargoTypes *refits)
 {
 	cargoes->Clear();
 	*refits = 0;
@@ -228,12 +228,12 @@ bool IsArticulatedVehicleRefittable(EngineID engine)
 * @param union_mask returns bit mask of CargoIDs which are a refit option for at least one articulated part
 * @param intersection_mask returns bit mask of CargoIDs which are a refit option for every articulated part (with default capacity > 0)
 */
-void GetArticulatedRefitMasks(EngineID engine, bool include_initial_cargo_type, uint32 *union_mask, uint32 *intersection_mask)
+void GetArticulatedRefitMasks(EngineID engine, bool include_initial_cargo_type, CargoTypes *union_mask, CargoTypes *intersection_mask)
 {
 	const Engine *e = Engine::Get(engine);
-	uint32 veh_cargoes = GetAvailableVehicleCargoTypes(engine, include_initial_cargo_type);
+	CargoTypes veh_cargoes = GetAvailableVehicleCargoTypes(engine, include_initial_cargo_type);
 	*union_mask = veh_cargoes;
-	*intersection_mask = (veh_cargoes != 0) ? veh_cargoes : UINT32_MAX;
+	*intersection_mask = (veh_cargoes != 0) ? veh_cargoes : ALL_CARGOTYPES;
 	if (!e->IsGroundVehicle()) return;
 	if (!HasBit(e->info.callback_mask, CBM_VEHICLE_ARTIC_ENGINE)) return;
@@ -254,9 +254,9 @@ void GetArticulatedRefitMasks(EngineID engine, bool include_initial_cargo_type,
 * @param include_initial_cargo_type if true the default cargo type of the vehicle is included; if false only the refit_mask
 * @return bit mask of CargoIDs which are a refit option for at least one articulated part
 */
-uint32 GetUnionOfArticulatedRefitMasks(EngineID engine, bool include_initial_cargo_type)
+CargoTypes GetUnionOfArticulatedRefitMasks(EngineID engine, bool include_initial_cargo_type)
 {
-	uint32 union_mask, intersection_mask;
+	CargoTypes union_mask, intersection_mask;
 	GetArticulatedRefitMasks(engine, include_initial_cargo_type, &union_mask, &intersection_mask);
 	return union_mask;
 }
@@ -267,9 +267,9 @@ uint32 GetUnionOfArticulatedRefitMasks(EngineID engine, bool include_initial_car
 * @param include_initial_cargo_type if true the default cargo type of the vehicle is included; if false only the refit_mask
 * @return bit mask of CargoIDs which are a refit option for every articulated part (with default capacity > 0)
 */
-uint32 GetIntersectionOfArticulatedRefitMasks(EngineID engine, bool include_initial_cargo_type)
+CargoTypes GetIntersectionOfArticulatedRefitMasks(EngineID engine, bool include_initial_cargo_type)
 {
-	uint32 union_mask, intersection_mask;
+	CargoTypes union_mask, intersection_mask;
 	GetArticulatedRefitMasks(engine, include_initial_cargo_type, &union_mask, &intersection_mask);
 	return intersection_mask;
 }
@@ -314,16 +314,16 @@ void CheckConsistencyOfArticulatedVehicle(const Vehicle *v)
 {
 	const Engine *engine = v->GetEngine();
-	uint32 purchase_refit_union, purchase_refit_intersection;
+	CargoTypes purchase_refit_union, purchase_refit_intersection;
 	GetArticulatedRefitMasks(v->engine_type, true, &purchase_refit_union, &purchase_refit_intersection);
 	CargoArray purchase_default_capacity = GetCapacityOfArticulatedParts(v->engine_type);
-	uint32 real_refit_union = 0;
+	CargoTypes real_refit_union = 0;
-	uint32 real_refit_intersection = UINT_MAX;
+	CargoTypes real_refit_intersection = ALL_CARGOTYPES;
 	CargoArray real_default_capacity;
 	do {
-		uint32 refit_mask = GetAvailableVehicleCargoTypes(v->engine_type, true);
+		CargoTypes refit_mask = GetAvailableVehicleCargoTypes(v->engine_type, true);
 		real_refit_union |= refit_mask;
 		if (refit_mask != 0) real_refit_intersection &= refit_mask;
--- a/src/articulated_vehicles.h
+++ b/src/articulated_vehicles.h
@@ -18,9 +18,9 @@
 uint CountArticulatedParts(EngineID engine_type, bool purchase_window);
 CargoArray GetCapacityOfArticulatedParts(EngineID engine);
 void AddArticulatedParts(Vehicle *first);
-void GetArticulatedRefitMasks(EngineID engine, bool include_initial_cargo_type, uint32 *union_mask, uint32 *intersection_mask);
+void GetArticulatedRefitMasks(EngineID engine, bool include_initial_cargo_type, CargoTypes *union_mask, CargoTypes *intersection_mask);
-uint32 GetUnionOfArticulatedRefitMasks(EngineID engine, bool include_initial_cargo_type);
+CargoTypes GetUnionOfArticulatedRefitMasks(EngineID engine, bool include_initial_cargo_type);
-uint32 GetIntersectionOfArticulatedRefitMasks(EngineID engine, bool include_initial_cargo_type);
+CargoTypes GetIntersectionOfArticulatedRefitMasks(EngineID engine, bool include_initial_cargo_type);
 bool IsArticulatedVehicleCarryingDifferentCargoes(const Vehicle *v, CargoID *cargo_type);
 bool IsArticulatedVehicleRefittable(EngineID engine);
 bool IsArticulatedEngine(EngineID engine_type);
--- a/src/autoreplace_cmd.cpp
+++ b/src/autoreplace_cmd.cpp
@@ -32,13 +32,12 @@ extern void ChangeVehicleViewWindow(VehicleID from_index, VehicleID to_index);
 * Figure out if two engines got at least one type of cargo in common (refitting if needed)
 * @param engine_a one of the EngineIDs
 * @param engine_b the other EngineID
 * @param type the type of the engines
 * @return true if they can both carry the same type of cargo (or at least one of them got no capacity at all)
 */
 static bool EnginesHaveCargoInCommon(EngineID engine_a, EngineID engine_b)
 {
-	uint32 available_cargoes_a = GetUnionOfArticulatedRefitMasks(engine_a, true);
+	CargoTypes available_cargoes_a = GetUnionOfArticulatedRefitMasks(engine_a, true);
-	uint32 available_cargoes_b = GetUnionOfArticulatedRefitMasks(engine_b, true);
+	CargoTypes available_cargoes_b = GetUnionOfArticulatedRefitMasks(engine_b, true);
 	return (available_cargoes_a == 0 || available_cargoes_b == 0 || (available_cargoes_a & available_cargoes_b) != 0);
 }
@@ -173,9 +172,8 @@ static void TransferCargo(Vehicle *old_veh, Vehicle *new_head, bool part_of_chai
 */
 static bool VerifyAutoreplaceRefitForOrders(const Vehicle *v, EngineID engine_type)
 {
-
+	CargoTypes union_refit_mask_a = GetUnionOfArticulatedRefitMasks(v->engine_type, false);
-	uint32 union_refit_mask_a = GetUnionOfArticulatedRefitMasks(v->engine_type, false);
+	CargoTypes union_refit_mask_b = GetUnionOfArticulatedRefitMasks(engine_type, false);
 	uint32 union_refit_mask_b = GetUnionOfArticulatedRefitMasks(engine_type, false);
 	const Order *o;
 	const Vehicle *u = (v->type == VEH_TRAIN) ? v->First() : v;
@@ -201,7 +199,7 @@ static bool VerifyAutoreplaceRefitForOrders(const Vehicle *v, EngineID engine_ty
 */
 static CargoID GetNewCargoTypeForReplace(Vehicle *v, EngineID engine_type, bool part_of_chain)
 {
-	uint32 available_cargo_types, union_mask;
+	CargoTypes available_cargo_types, union_mask;
 	GetArticulatedRefitMasks(engine_type, true, &union_mask, &available_cargo_types);
 	if (union_mask == 0) return CT_NO_REFIT; // Don't try to refit an engine with no cargo capacity
@@ -238,7 +236,7 @@ static CargoID GetNewCargoTypeForReplace(Vehicle *v, EngineID engine_type, bool
 * @param v The vehicle to find a replacement for
 * @param c The vehicle's owner (it's faster to forward the pointer than refinding it)
 * @param always_replace Always replace, even if not old.
- * @param [out] e the EngineID of the replacement. INVALID_ENGINE if no replacement is found
+ * @param[out] e the EngineID of the replacement. INVALID_ENGINE if no replacement is found
 * @return Error if the engine to build is not available
 */
 static CommandCost GetNewEngineType(const Vehicle *v, const Company *c, bool always_replace, EngineID &e)
--- a/src/autoreplace_gui.cpp
+++ b/src/autoreplace_gui.cpp
@@ -81,7 +81,7 @@ class ReplaceVehicleWindow : public Window {
 	EngineID sel_engine[2];       ///< Selected engine left and right.
 	GUIEngineList engines[2];     ///< Left and right list of engines.
 	bool replace_engines;         ///< If \c true, engines are replaced, if \c false, wagons are replaced (only for trains).
-	bool reset_sel_engine;        ///< Also reset #sel_engine while updating left and/or right (#update_left and/or #update_right) and no valid engine selected.
+	bool reset_sel_engine;        ///< Also reset #sel_engine while updating left and/or right and no valid engine selected.
 	GroupID sel_group;            ///< Group selected to replace.
 	int details_height;           ///< Minimal needed height of the details panels (found so far).
 	byte sort_criteria;           ///< Criteria of sorting vehicles.
--- a/src/base_media_base.h
+++ b/src/base_media_base.h
@@ -26,6 +26,7 @@ struct ContentInfo;
 struct MD5File {
 	/** The result of a checksum check */
 	enum ChecksumResult {
 		CR_UNKNOWN,  ///< The file has not been checked yet
 		CR_MATCH,    ///< The file did exist and the md5 checksum did match
 		CR_MISMATCH, ///< The file did exist, just the md5 checksum did not match
 		CR_NO_FILE,  ///< The file did not exist
@@ -34,6 +35,7 @@ struct MD5File {
 	const char *filename;        ///< filename
 	uint8 hash[16];              ///< md5 sum of the file
 	const char *missing_warning; ///< warning when this file is missing
 	ChecksumResult check_result; ///< cached result of md5 check
 	ChecksumResult CheckMD5(Subdirectory subdir, size_t max_size) const;
 };
@@ -285,11 +287,32 @@ static const uint NUM_SONGS_AVAILABLE = 1 + NUM_SONG_CLASSES * NUM_SONGS_CLASS;
 /** Maximum number of songs in the (custom) playlist */
 static const uint NUM_SONGS_PLAYLIST  = 32;
 /* Functions to read DOS music CAT files, similar to but not quite the same as sound effect CAT files */
 char *GetMusicCatEntryName(const char *filename, size_t entrynum);
 byte *GetMusicCatEntryData(const char *filename, size_t entrynum, size_t &entrylen);
 enum MusicTrackType {
 	MTT_STANDARDMIDI, ///< Standard MIDI file
 	MTT_MPSMIDI,      ///< MPS GM driver MIDI format (contained in a CAT file)
 };
 /** Metadata about a music track. */
 struct MusicSongInfo {
 	char songname[32];       ///< name of song displayed in UI
 	byte tracknr;            ///< track number of song displayed in UI
 	const char *filename;    ///< file on disk containing song (when used in MusicSet class, this pointer is owned by MD5File object for the file)
 	MusicTrackType filetype; ///< decoder required for song file
 	int cat_index;           ///< entry index in CAT file, for filetype==MTT_MPSMIDI
 	bool loop;               ///< song should play in a tight loop if possible, never ending
 	int override_start;      ///< MIDI ticks to skip over in beginning
 	int override_end;        ///< MIDI tick to end the song at (0 if no override)
 };
 /** All data of a music set. */
 struct MusicSet : BaseSet<MusicSet, NUM_SONGS_AVAILABLE, false> {
-	/** The name of the different songs. */
+	/** Data about individual songs in set. */
-	char song_name[NUM_SONGS_AVAILABLE][32];
+	MusicSongInfo songinfo[NUM_SONGS_AVAILABLE];
-	byte track_nr[NUM_SONGS_AVAILABLE];
+	/** Number of valid songs in set. */
 	byte num_available;
 	bool FillSetDetails(struct IniFile *ini, const char *path, const char *full_filename);
--- a/src/base_media_func.h
+++ b/src/base_media_func.h
@@ -40,8 +40,6 @@
 template <class T, size_t Tnum_files, bool Tsearch_in_tars>
 bool BaseSet<T, Tnum_files, Tsearch_in_tars>::FillSetDetails(IniFile *ini, const char *path, const char *full_filename, bool allow_empty_filename)
 {
 	memset(this, 0, sizeof(*this));
 	IniGroup *metadata = ini->GetGroup("metadata");
 	IniItem *item;
@@ -129,7 +127,11 @@ bool BaseSet<T, Tnum_files, Tsearch_in_tars>::FillSetDetails(IniFile *ini, const
 			file->missing_warning = stredup(item->value);
 		}
-		switch (T::CheckMD5(file, BASESET_DIR)) {
+		file->check_result = T::CheckMD5(file, BASESET_DIR);
 		switch (file->check_result) {
 			case MD5File::CR_UNKNOWN:
 				break;
 			case MD5File::CR_MATCH:
 				this->valid_files++;
 				this->found_files++;
--- a/Show More
+++ b/Show More