Update to OpenTTD 1.9.0-beta2

--HG--
branch : openttd

projects/determineversion.vbs

@@ -1,6 +1,6 @@
 Option Explicit
 
-' $Id: determineversion.vbs 24826 2012-12-19 02:42:25Z glx $
+' $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.
@@ -21,312 +21,138 @@ Sub FindReplaceInFile(filename, to_find, replacement)
 	file.Close
 End Sub
 
-Sub UpdateFile(modified, revision, version, cur_date, filename)
+Sub UpdateFile(modified, isodate, version, cur_date, githash, filename)
 	FSO.CopyFile filename & ".in", filename
 	FindReplaceInFile filename, "!!MODIFIED!!", modified
-	FindReplaceInFile filename, "!!REVISION!!", revision
+	FindReplaceInFile filename, "!!ISODATE!!", isodate
 	FindReplaceInFile filename, "!!VERSION!!", version
 	FindReplaceInFile filename, "!!DATE!!", cur_date
+	FindReplaceInFile filename, "!!GITHASH!!", githash
 End Sub
 
 Sub UpdateFiles(version)
-	Dim modified, revision, cur_date
+	Dim modified, isodate, cur_date, githash
 	cur_date = DatePart("D", Date) & "." & DatePart("M", Date) & "." & DatePart("YYYY", Date)
 
 	If InStr(version, Chr(9)) Then
-		revision = Mid(version, InStr(version, Chr(9)) + 1)
-		modified = Mid(revision, InStr(revision, Chr(9)) + 1)
-		revision = Mid(revision, 1, InStr(revision, Chr(9)) - 1)
+		isodate  = Mid(version, InStr(version, Chr(9)) + 1)
+		modified = Mid(isodate, InStr(isodate, Chr(9)) + 1)
+		githash  = Mid(modified, InStr(modified, Chr(9)) + 1)
+		isodate  = Mid(isodate, 1, InStr(isodate, Chr(9)) - 1)
 		modified = Mid(modified, 1, InStr(modified, Chr(9)) - 1)
 		version  = Mid(version, 1, InStr(version, Chr(9)) - 1)
 	Else
-		revision = 0
+		isodate = 0
 		modified = 1
+		githash = ""
 	End If
 
-	UpdateFile modified, revision, version, cur_date, "../src/rev.cpp"
-	UpdateFile modified, revision, version, cur_date, "../src/os/windows/ottdres.rc"
+	UpdateFile modified, isodate, version, cur_date, githash, "../src/rev.cpp"
+	UpdateFile modified, isodate, version, cur_date, githash, "../src/os/windows/ottdres.rc"
 End Sub
 
-Function ReadRegistryKey(shive, subkey, valuename, architecture)
-	Dim hiveKey, objCtx, objLocator, objServices, objReg, Inparams, Outparams
-
-	' First, get the Registry Provider for the requested architecture
-	Set objCtx = CreateObject("WbemScripting.SWbemNamedValueSet")
-	objCtx.Add "__ProviderArchitecture", architecture ' Must be 64 of 32
-	Set objLocator = CreateObject("Wbemscripting.SWbemLocator")
-	Set objServices = objLocator.ConnectServer("","root\default","","",,,,objCtx)
-	Set objReg = objServices.Get("StdRegProv")
-
-	' Check the hive and give it the right value
-	Select Case shive
-		Case "HKCR", "HKEY_CLASSES_ROOT"
-			hiveKey = &h80000000
-		Case "HKCU", "HKEY_CURRENT_USER"
-			hiveKey = &H80000001
-		Case "HKLM", "HKEY_LOCAL_MACHINE"
-			hiveKey = &h80000002
-		Case "HKU", "HKEY_USERS"
-			hiveKey = &h80000003
-		Case "HKCC", "HKEY_CURRENT_CONFIG"
-			hiveKey = &h80000005
-		Case "HKDD", "HKEY_DYN_DATA" ' Only valid for Windows 95/98
-			hiveKey = &h80000006
-		Case Else
-			MsgBox "Hive not valid (ReadRegistryKey)"
-	End Select
-
-	Set Inparams = objReg.Methods_("GetStringValue").Inparameters
-	Inparams.Hdefkey = hiveKey
-	Inparams.Ssubkeyname = subkey
-	Inparams.Svaluename = valuename
-	Set Outparams = objReg.ExecMethod_("GetStringValue", Inparams,,objCtx)
-
-	ReadRegistryKey = Outparams.SValue
-End Function
-
-Function DetermineSVNVersion()
-	Dim WshShell, version, branch, modified, revision, clean_rev, url, oExec, line, hash
+Function DetermineVersion()
+	Dim WshShell, branch, tag, modified, isodate, oExec, line, hash, shorthash
 	Set WshShell = CreateObject("WScript.Shell")
 	On Error Resume Next
 
-	revision = 0
+	modified = 0
+	hash = ""
+	shorthash = ""
+	branch = ""
+	isodate = ""
+	tag = ""
 
-	' Try TortoiseSVN
-	' Get the directory where TortoiseSVN (should) reside(s)
-	Dim sTortoise
-	' First, try with 32-bit architecture
-	sTortoise = ReadRegistryKey("HKLM", "SOFTWARE\TortoiseSVN", "Directory", 32)
-	If sTortoise = "" Or IsNull(sTortoise) Then
-		' No 32-bit version of TortoiseSVN installed, try 64-bit version (doesn't hurt on 32-bit machines, it returns nothing or is ignored)
-		sTortoise = ReadRegistryKey("HKLM", "SOFTWARE\TortoiseSVN", "Directory", 64)
-	End If
+	' Set the environment to english
+	WshShell.Environment("PROCESS")("LANG") = "en"
 
-	' If TortoiseSVN is installed, try to get the revision number
-	If sTortoise <> "" Then
-		Dim SubWCRev
-		Set SubWCRev = WScript.CreateObject("SubWCRev.object")
-		SubWCRev.GetWCInfo FSO.GetAbsolutePathName("../"), 0, 0
-		revision = SubWCRev.Revision
-		version = "r" & revision
-		modified = 0
-		if SubWCRev.HasModifications then modified = 2
-		url = SubWCRev.Url
-	End If
+	Set oExec = WshShell.Exec("git rev-parse --verify HEAD")
+	If Err.Number = 0 Then
+		' Wait till the application is finished ...
+		Do While oExec.Status = 0
+		Loop
 
-	' Looks like there is no TortoiseSVN installed either. Then we don't know it.
-	If revision = 0 Then
-		' Reset error and version
-		Err.Clear
-		version = "norev000"
-		modified = 0
-
-		' Set the environment to english
-		WshShell.Environment("PROCESS")("LANG") = "en"
-
-		' Do we have subversion installed? Check immediatelly whether we've got a modified WC.
-		Set oExec = WshShell.Exec("svnversion ../")
-		If Err.Number = 0 Then
-			' Wait till the application is finished ...
-			Do While oExec.Status = 0
-			Loop
-
-			line = OExec.StdOut.ReadLine()
-			If line <> "exported" Then
-				If InStr(line, "M") Then
-					modified = 2
-				End If
-
-				' And use svn info to get the correct revision and branch information.
-				Set oExec = WshShell.Exec("svn info ../")
-				If Err.Number = 0 Then
-					Do
-						line = OExec.StdOut.ReadLine()
-						If InStr(line, "URL") Then
-							url = line
-						End If
-						If InStr(line, "Last Changed Rev") Then
-							revision = Mid(line, 19)
-							version = "r" & revision
-						End If
-					Loop While Not OExec.StdOut.atEndOfStream
-				End If ' Err.Number = 0
-			End If ' line <> "exported"
-		End If ' Err.Number = 0
-	End If ' InStr(version, "$")
-
-	If version <> "norev000" Then
-		If InStr(url, "branches") Then
-			branch = Mid(url, InStr(url, "branches/") + 9)
-		End If
-		If InStr(url, "tags") Then
-			version = Mid(url, InStr(url, "tags/") + 5)
-		End If
-	Else ' version <> "norev000"
-		' svn detection failed, reset error and try git
-		Err.Clear
-		Set oExec = WshShell.Exec("git rev-parse --verify HEAD")
-		If Err.Number = 0 Then
-			' Wait till the application is finished ...
-			Do While oExec.Status = 0
-			Loop
-
-			If oExec.ExitCode = 0 Then
-				hash = oExec.StdOut.ReadLine()
-				version = "g" & Mid(hash, 1, 8)
-				' Make sure index is in sync with disk
-				Set oExec = WshShell.Exec("git update-index --refresh")
-				If Err.Number = 0 Then
-					' StdOut and StdErr share a 4kB buffer so prevent it from filling up as we don't care about the output
-					oExec.StdOut.Close
-					oExec.StdErr.Close
-					' Wait till the application is finished ...
-					Do While oExec.Status = 0
-						WScript.Sleep 10
-					Loop
-				End If
-				Set oExec = WshShell.Exec("git diff-index --exit-code --quiet HEAD ../")
-				If Err.Number = 0 Then
-					' Wait till the application is finished ...
-					Do While oExec.Status = 0
-					Loop
-
-					If oExec.ExitCode = 1 Then
-						modified = 2
-					End If ' oExec.ExitCode = 1
-
-					Set oExec = WshShell.Exec("git symbolic-ref HEAD")
-					If Err.Number = 0 Then
-						line = oExec.StdOut.ReadLine()
-						line = Mid(line, InStrRev(line, "/") + 1)
-						If line <> "master" Then
-							branch = line
-						End If ' line <> "master"
-					End If ' Err.Number = 0
-
-					Set oExec = WshShell.Exec("git log --pretty=format:%s --grep=" & Chr(34) & "^(svn r[0-9]*)" & Chr(34) & " -1")
-					if Err.Number = 0 Then
-						revision = Mid(oExec.StdOut.ReadLine(), 7)
-						revision = Mid(revision, 1, InStr(revision, ")") - 1)
-					End If ' Err.Number = 0
-					If revision = "" Then
-						' No revision? Maybe it is a custom git-svn clone
-						' Reset error number as WshShell.Exec will not do that on success
-						Err.Clear
-						Set oExec = WshShell.Exec("git log --pretty=format:%b --grep=" & Chr(34) & "git-svn-id:.*@[0-9]*" & Chr(34) & " -1")
-						If Err.Number = 0 Then
-							revision = oExec.StdOut.ReadLine()
-							revision = Mid(revision, InStr(revision, "@") + 1)
-							revision = Mid(revision, 1, InStr(revision, " ") - 1)
-						End If ' Err.Number = 0
-					End If ' revision = ""
-
-					' Check if a tag is currently checked out
-					Err.Clear
-					Set oExec = WshShell.Exec("git name-rev --name-only --tags --no-undefined HEAD")
-					If Err.Number = 0 Then
-						' Wait till the application is finished ...
-						Do While oExec.Status = 0
-						Loop
-						If oExec.ExitCode = 0 Then
-							version = oExec.StdOut.ReadLine()
-							If Right(version, 2) = "^0" Then
-								version = Left(version, Len(version) - 2)
-							End If
-							branch = ""
-						End If ' oExec.ExitCode = 0
-					End If ' Err.Number = 0
-				End If ' Err.Number = 0
-			End If ' oExec.ExitCode = 0
-		End If ' Err.Number = 0
-
-		If version = "norev000" Then
-			' git detection failed, reset error and try mercurial (hg)
-			Err.Clear
-			Set oExec = WshShell.Exec("hg id -i")
+		If oExec.ExitCode = 0 Then
+			hash = oExec.StdOut.ReadLine()
+			shorthash = Mid(hash, 1, 10)
+			' Make sure index is in sync with disk
+			Set oExec = WshShell.Exec("git update-index --refresh")
+			If Err.Number = 0 Then
+				' StdOut and StdErr share a 4kB buffer so prevent it from filling up as we don't care about the output
+				oExec.StdOut.Close
+				oExec.StdErr.Close
+				' Wait till the application is finished ...
+				Do While oExec.Status = 0
+					WScript.Sleep 10
+				Loop
+			End If
+			Set oExec = WshShell.Exec("git diff-index --exit-code --quiet HEAD ../")
 			If Err.Number = 0 Then
 				' Wait till the application is finished ...
 				Do While oExec.Status = 0
 				Loop
 
-				If oExec.ExitCode = 0 Then
-					line = OExec.StdOut.ReadLine()
-					hash = Left(line, 12)
-					version = "h" & Mid(hash, 1, 8)
+				If oExec.ExitCode = 1 Then
+					modified = 2
+				End If ' oExec.ExitCode = 1
 
-					' Check if a tag is currently checked out
-					Err.Clear
-					Set oExec = WshShell.Exec("hg id -t")
-					If Err.Number = 0 Then
-						line = oExec.StdOut.ReadLine()
-						If Len(line) > 0 And Right(line, 3) <> "tip" Then
-							version = line
-							branch = ""
-						End If ' Len(line) > 0 And Right(line, 3) <> "tip"
-					End If ' Err.Number = 0
+				Set oExec = WshShell.Exec("git show -s --pretty=format:%ci")
+				if Err.Number = 0 Then
+					isodate = Mid(oExec.StdOut.ReadLine(), 1, 10)
+					isodate = Replace(isodate, "-", "")
+				End If ' Err.Number = 0
 
-					Err.Clear
-					Set oExec = WshShell.Exec("hg status ../")
-					If Err.Number = 0 Then
-						Do
-							line = OExec.StdOut.ReadLine()
-							If Len(line) > 0 And Mid(line, 1, 1) <> "?" Then
-								modified = 2
-								Exit Do
-							End If ' Len(line) > 0 And Mid(line, 1, 1) <> "?"
-						Loop While Not OExec.StdOut.atEndOfStream
+				' Check branch
+				Err.Clear
+				Set oExec = WshShell.Exec("git symbolic-ref HEAD")
+				If Err.Number = 0 Then
+					line = oExec.StdOut.ReadLine()
+					branch = Mid(line, InStrRev(line, "/") + 1)
+				End If ' Err.Number = 0
 
-						Set oExec = WshShell.Exec("hg branch")
-						If Err.Number = 0 Then
-							line = OExec.StdOut.ReadLine()
-							If line <> "default" Then
-								branch = line
-							End If ' line <> "default"
-						End If ' Err.Number = 0
-
-						Set oExec = WshShell.Exec("hg log -f -k " & Chr(34) & "(svn r" & Chr(34) & " -l 1 --template " & Chr(34) & "{desc|firstline}\n" & Chr(34) & " --cwd ../")
-						If Err.Number = 0 Then
-							line = oExec.StdOut.ReadLine()
-							If Left(line, 6) = "(svn r" Then
-								revision = Mid(line, 7)
-								revision = Mid(revision, 1, InStr(revision, ")") - 1)
-							End If 'Left(line, 6) = "(svn r"
-						End If ' Err.Number = 0
-
-						If revision = "" Then
-							' No rev? Maybe it is a custom hgsubversion clone
-							Err.Clear
-							Set oExec = WshShell.Exec("hg parent --template=" & Chr(34) & "{svnrev}" & Chr(34))
-							If Err.Number = 0 Then
-								revision = oExec.StdOut.ReadLine()
-							End If ' Err.Number = 0
-						End If ' revision = ""
-					End If ' Err.Number = 0
-				End If ' oExec.ExitCode = 0
+				' Check if a tag is currently checked out
+				Err.Clear
+				Set oExec = WshShell.Exec("git name-rev --name-only --tags --no-undefined HEAD")
+				If Err.Number = 0 Then
+					' Wait till the application is finished ...
+					Do While oExec.Status = 0
+					Loop
+					If oExec.ExitCode = 0 Then
+						tag = oExec.StdOut.ReadLine()
+						If Right(tag, 2) = "^0" Then
+							tag = Left(tag, Len(tag) - 2)
+						End If
+					End If ' oExec.ExitCode = 0
+				End If ' Err.Number = 0
 			End If ' Err.Number = 0
-		End If ' version = "norev000"
-	End If ' version <> "norev000"
+		End If ' oExec.ExitCode = 0
+	End If ' Err.Number = 0
 
-	If version = "norev000" And FSO.FileExists("../.ottdrev") Then
+	If hash = "" And FSO.FileExists("../.ottdrev") Then
 		Dim rev_file
 		Set rev_file = FSO.OpenTextFile("../.ottdrev", 1, True, 0)
-		DetermineSVNVersion = rev_file.ReadLine()
+		DetermineVersion = rev_file.ReadLine()
 		rev_file.Close()
+	ElseIf hash = "" Then
+		DetermineVersion = "norev000"
+		modified = 1
 	Else
-		If modified = 2 Then
-			version = version & "M"
-		End If
-
-		clean_rev = version
-		If branch <> "" Then
-			version = version & "-" & branch
-		End If
-
-		If version <> "norev000" Then
-			DetermineSVNVersion = version & Chr(9) & revision & Chr(9) & modified & Chr(9) & clean_rev
+		Dim version, hashprefix
+		If modified = 0 Then
+			hashprefix = "-g"
+		ElseIf modified = 2 Then
+			hashprefix = "-m"
 		Else
-			DetermineSVNVersion = version
+			hashprefix = "-u"
 		End If
+
+		If tag <> "" Then
+			version = tag
+		Else
+			version = isodate & "-" & branch & hashprefix & shorthash
+		End If
+
+		DetermineVersion = version & Chr(9) & isodate & Chr(9) & modified & Chr(9) & hash
 	End If
 End Function
 
@@ -359,7 +185,7 @@ Function CheckFile(filename)
 End Function
 
 Dim version
-version = DetermineSVNVersion
+version = DetermineVersion
 If Not (IsCachedVersion(version) And CheckFile("../src/rev.cpp") And CheckFile("../src/os/windows/ottdres.rc")) Then
 	UpdateFiles version
 End If

projects/dpi_aware.manifest

@@ -1,7 +1,29 @@
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" >
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
   <application xmlns="urn:schemas-microsoft-com:asm.v3">
-    <windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
-      <dpiAware>True/PM</dpiAware>
+    <windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">True/PM</dpiAware>
     </windowsSettings>
   </application>
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!--This Id value indicates the application supports Windows Vista functionality -->
+      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+      <!--This Id value indicates the application supports Windows 7 functionality-->
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+      <!--This Id value indicates the application supports Windows 8 functionality-->
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+      <!--This Id value indicates the application supports Windows 8.1 functionality-->
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+      <!--This Id value indicates the application supports Windows 10 functionality-->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+    </application>
+  </compatibility>
 </assembly>

projects/generate

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# $Id: generate 27918 2017-09-24 16:19:29Z frosch $
+# $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.
@@ -22,6 +22,16 @@ then
 	exit 1
 fi
 
+# openttd_vs142.sln             is for MSVC 2019
+# openttd_vs142.vcxproj         is for MSVC 2019
+# openttd_vs142.vcxproj.filters is for MSVC 2019
+# langs_vs142.vcxproj           is for MSVC 2019
+# strgen_vs142.vcxproj          is for MSVC 2019
+# strgen_vs142.vcxproj.filters  is for MSVC 2019
+# generate_vs142.vcxproj        is for MSVC 2019
+# version_vs142.vcxproj         is for MSVC 2019
+# basesets_vs142.vcxproj        is for MSVC 2019
+
 # openttd_vs141.sln             is for MSVC 2017
 # openttd_vs141.vcxproj         is for MSVC 2017
 # openttd_vs141.vcxproj.filters is for MSVC 2017
@@ -30,6 +40,7 @@ fi
 # strgen_vs141.vcxproj.filters  is for MSVC 2017
 # generate_vs141.vcxproj        is for MSVC 2017
 # version_vs141.vcxproj         is for MSVC 2017
+# basesets_vs141.vcxproj        is for MSVC 2017
 
 # openttd_vs140.sln             is for MSVC 2015
 # openttd_vs140.vcxproj         is for MSVC 2015
@@ -39,29 +50,8 @@ fi
 # strgen_vs140.vcxproj.filters  is for MSVC 2015
 # generate_vs140.vcxproj        is for MSVC 2015
 # version_vs140.vcxproj         is for MSVC 2015
+# basesets_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 +64,7 @@ enable_dedicated="0"
 enable_ai="1"
 with_cocoa="0"
 enable_directmusic="1"
+enable_fluidsynth="0"
 with_threads="1"
 file_prefix="..\\\\src\\\\"
 
@@ -123,7 +114,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 +121,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; }
 
@@ -146,17 +136,7 @@ load_main_data() {
 				gsub("	", "", $0);
 				gsub("^#", "", $0);
 				gsub("^ ", "", $0);
-
-				if (first_time != 0) {
-					print "#1		</Filter>";
-				} else {
-					first_time = 1;
-				}
-
 				filter = $0;
-				print "#1		<Filter";
-				print "#1			Name=\\""filter"\\"";
-				print "#1			>";
 				print "#3    <Filter Include=\\""filter"\\">";
 				printf "#3      <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-%012d}</UniqueIdentifier>\n", i;
 				print "#3    </Filter>";
@@ -170,10 +150,6 @@ load_main_data() {
 			if (deep == skip) {
 				gsub("	", "", $0);
 				gsub("/", "\\\\", $0);
-				print "#1			<File";
-				print "#1				RelativePath=\\".\\\\'$file_prefix'"$0"\\"";
-				print "#1				>";
-				print "#1			</File>";
 				split($0, file, ".");
 				cltype = "ClInclude"
 				if (file[2] == "cpp") cltype = "ClCompile";
@@ -184,7 +160,6 @@ load_main_data() {
 				print "#4    </"cltype">";
 			}
 		}
-		END { print "#1		</Filter>"; }
 	'`"
 
 	eval "$2=\"\$RES\""
@@ -192,29 +167,16 @@ 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
 		fi
 		RES="$RES
-#1			<File
-#1				RelativePath=\"..\\src\\lang\\"$i".txt\"
-#1				>
-#1				<FileConfiguration
-#1					Name=\"Debug|Win32\"
-#1					>
-#1					<Tool
-#1						Name=\"VCCustomBuildTool\"
-#1						Description=\"Generating "$i" language file\"
-#1						CommandLine=\"..\\objs\\strgen\\strgen.exe -s ..\\src\\lang -d ..\\bin\\lang &quot;\$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;\"
-#1						AdditionalDependencies=\"..\\src\\lang\\english.txt;..\\objs\\strgen\\strgen.exe\"
-#1						Outputs=\"..\\bin\\lang\\"$i".lng\"
-#1					/>
-#1				</FileConfiguration>
-#1			</File>
 #2    <CustomBuild Include=\"..\\src\\lang\\"$i".txt\">
 #2      <Message Condition=\"'\$(Configuration)|\$(Platform)'=='Debug|Win32'\">Generating "$i" language file</Message>
 #2      <Command Condition=\"'\$(Configuration)|\$(Platform)'=='Debug|Win32'\">..\\objs\\strgen\\strgen.exe -s ..\\src\\lang -d ..\\bin\\lang \"%(FullPath)\"</Command>
@@ -237,10 +199,6 @@ load_settings_data() {
 	do
 		i=`basename $i`
 		RES="$RES
-#1		<File
-#1			RelativePath=\"..\\src\\table\\"$i"\"
-#1			>
-#1		</File>
 #2    <None Include=\"..\\src\\table\\"$i"\" />
 #4    <None Include=\"..\\src\\table\\"$i"\">
 #4      <Filter>INI</Filter>
@@ -251,6 +209,44 @@ load_settings_data() {
 	eval "$2=\"\$RES\$RES2\""
 }
 
+load_baseset_data() {
+	FIRST=""
+	RES=""
+	RES2="
+#4    <Langs>"
+	# 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 $2 | sed s~.txt$~~g | sort`
+	do
+		if [ "$FIRST" != "" ]; then
+			RES2="$RES2;"
+		else
+			FIRST=1
+		fi
+		i=`basename $i`
+		RES2="$RES2..\\src\\lang\\$i.txt"
+	done
+	RES2="$RES2</Langs>"
+	# Windows Folder sort and Linux Folder sort are slightly different.
+	# By fiddling with the extension and sorting it on Linux, they are the same.
+	for i in `ls $1 | sed s~\\\.~000~g | sort | sed s~000~.~g`
+	do
+		i=`basename $i`
+		RES="$RES
+#2    <CustomBuild Include=\"..\\media\\baseset\\"$i"\">
+#2      <Message Condition=\"'\$(Configuration)|\$(Platform)'=='Debug|Win32'\">Generating "$i" baseset metadata file</Message>
+#2      <Command Condition=\"'\$(Configuration)|\$(Platform)'=='Debug|Win32'\">cscript //nologo ..\\media\\baseset\\translations.vbs \"%(FullPath)\" \"\$(OutputPath)$i\" ..\\src\\lang ..\\bin\\baseset\\orig_extra.grf</Command>
+#2      <AdditionalInputs Condition=\"'\$(Configuration)|\$(Platform)'=='Debug|Win32'\">\$(Langs);..\\bin\\baseset\\orig_extra.grf;%(AdditionalInputs)</AdditionalInputs>
+#2      <Outputs Condition=\"'\$(Configuration)|\$(Platform)'=='Debug|Win32'\">..\\bin\\baseset\\"$i";%(Outputs)</Outputs>
+#2    </CustomBuild>
+#3    <CustomBuild Include=\"..\\media\\baseset\\"$i"\">
+#3      <Filter>Baseset Metadata</Filter>
+#3    </CustomBuild>"
+	done
+
+	eval "$3=\"\$RES\$RES2\""
+}
+
 generate() {
 	echo "Generating $2..."
 	if [ $# -eq 3 ]; then
@@ -307,40 +303,42 @@ load_main_data "$ROOT_DIR/source.list" openttd
 openttdfiles=`echo "$openttd" | grep "^#4" | sed "s~#4~~g"`
 openttdfilters=`echo "$openttd" | grep "^#3" | sed "s~#3~~g"`
 openttdvcxproj=`echo "$openttd" | grep "^#2" | sed "s~#2~~g"`
-openttd=`echo "$openttd" | grep "^#1" | sed "s~#1~~g"`
 
 load_lang_data "$ROOT_DIR/src/lang/*.txt" lang
 langfiles=`echo "$lang" | grep "^#3" | sed "s~#3~~g"`
 langvcxproj=`echo "$lang" | grep "^#2" | sed "s~#2~~g"`
-lang=`echo "$lang" | grep "^#1" | sed "s~#1~~g"`
 
 load_settings_data "$ROOT_DIR/src/table/*.ini" settings
 settingsfiles=`echo "$settings" | grep "^#4" | sed "s~#4~~g"`
 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"
+load_baseset_data "$ROOT_DIR/media/baseset/*.ob?" "$ROOT_DIR/src/lang/*.txt" baseset
+basesetfiles=`echo "$baseset" | grep "^#3" | sed "s-#3--g"`
+basesetvcxproj=`echo "$baseset" | grep "^#2" | sed "s~#2~~g"`
+basesetlangs=`echo "$baseset" | grep "^#4" | sed "s~#4~~g"`
+
 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 "$openttdvcxproj" "openttd_vs142.vcxproj"
+generate "$openttdfiles" "openttd_vs142.vcxproj.filters" "$openttdfilters"
 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 "$langvcxproj" "langs_vs142.vcxproj"
+generate "$langfiles" "langs_vs142.vcxproj.filters"
 generate "$settingsvcxproj" "settings_vs140.vcxproj" "$settingscommand"
 generate "$settingsfiles" "settings_vs140.vcxproj.filters"
 generate "$settingsvcxproj" "settings_vs141.vcxproj" "$settingscommand"
 generate "$settingsfiles" "settings_vs141.vcxproj.filters"
+generate "$settingsvcxproj" "settings_vs142.vcxproj" "$settingscommand"
+generate "$settingsfiles" "settings_vs142.vcxproj.filters"
+generate "$basesetvcxproj" "basesets_vs140.vcxproj" "$basesetlangs"
+generate "$basesetfiles" "basesets_vs140.vcxproj.filters"
+generate "$basesetvcxproj" "basesets_vs141.vcxproj" "$basesetlangs"
+generate "$basesetfiles" "basesets_vs141.vcxproj.filters"
+generate "$basesetvcxproj" "basesets_vs142.vcxproj" "$basesetlangs"
+generate "$basesetfiles" "basesets_vs142.vcxproj.filters"

projects/generate.vbs

@@ -1,6 +1,6 @@
 Option Explicit
 
-' $Id: generate.vbs 27918 2017-09-24 16:19:29Z frosch $
+' $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.
@@ -10,6 +10,16 @@ Option Explicit
 Dim FSO
 Set FSO = CreateObject("Scripting.FileSystemObject")
 
+' openttd_vs142.sln             is for MSVC 2019
+' openttd_vs142.vcxproj         is for MSVC 2019
+' openttd_vs142.vcxproj.filters is for MSVC 2019
+' langs_vs142.vcxproj           is for MSVC 2019
+' strgen_vs142.vcxproj          is for MSVC 2019
+' strgen_vs142.vcxproj.filters  is for MSVC 2019
+' generate_vs142.vcxproj        is for MSVC 2019
+' version_vs142.vcxproj         is for MSVC 2019
+' basesets_vs142.vcxproj        is for MSVC 2019
+
 ' openttd_vs141.sln             is for MSVC 2017
 ' openttd_vs141.vcxproj         is for MSVC 2017
 ' openttd_vs141.vcxproj.filters is for MSVC 2017
@@ -18,6 +28,7 @@ Set FSO = CreateObject("Scripting.FileSystemObject")
 ' strgen_vs141.vcxproj.filters  is for MSVC 2017
 ' generate_vs141.vcxproj        is for MSVC 2017
 ' version_vs141.vcxproj         is for MSVC 2017
+' basesets_vs141.vcxproj        is for MSVC 2017
 
 ' openttd_vs140.sln             is for MSVC 2015
 ' openttd_vs140.vcxproj         is for MSVC 2015
@@ -27,29 +38,7 @@ Set FSO = CreateObject("Scripting.FileSystemObject")
 ' strgen_vs140.vcxproj.filters  is for MSVC 2015
 ' 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
+' basesets_vs140.vcxproj        is for MSVC 2015
 
 Sub safety_check(filename)
 	Dim file, line, regexp, list
@@ -163,9 +152,8 @@ Sub headers_check(filename, dir)
 	End If
 End Sub
 
-Function load_main_data(filename, ByRef vcxproj, ByRef filters, ByRef files)
-	Dim res, file, line, deep, skip, first_filter, first_file, filter, cltype, index
-	res = ""
+Sub load_main_data(filename, ByRef vcxproj, ByRef filters, ByRef files)
+	Dim file, line, deep, skip, first_filter, first_file, filter, cltype, index
 	index = 0
 	' Read the source.list and process it
 	Set file = FSO.OpenTextFile(filename, 1, 0, 0)
@@ -199,16 +187,11 @@ Function load_main_data(filename, ByRef vcxproj, ByRef filters, ByRef files)
 					if deep = skip Then
 						line = Replace(line, "# ", "")
 						if first_filter <> 0 Then
-							res = res & "		</Filter>" & vbCrLf
 							filters = filters & vbCrLf
 						Else
 							first_filter = 1
 						End If
 						filter = line
-						res = res & _
-						"		<Filter" & vbCrLf & _
-						"			Name=" & Chr(34) & filter & Chr(34) & vbCrLf & _
-						"			>" & vbCrLf
 						filters = filters & _
 						"    <Filter Include="& Chr(34) & filter & Chr(34) & ">" & vbCrLf & _
 						"      <UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-" & String(12 - Len(CStr(index)), "0") & index & "}</UniqueIdentifier>" & vbCrLf & _
@@ -224,11 +207,6 @@ Function load_main_data(filename, ByRef vcxproj, ByRef filters, ByRef files)
 						Else
 							first_file = 1
 						End If
-						res = res & _
-						"			<File" & vbCrLf & _
-						"				RelativePath=" & Chr(34) & ".\..\src\" & line & Chr(34) & vbCrLf & _
-						"				>" & vbCrLf & _
-						"			</File>" & vbCrLf
 						Select Case Split(Line, ".")(1)
 							Case "cpp"
 								cltype = "ClCompile"
@@ -246,42 +224,22 @@ Function load_main_data(filename, ByRef vcxproj, ByRef filters, ByRef files)
 			End Select
 		End If
 	Wend
-	res = res & "		</Filter>"
 	file.Close()
-	load_main_data = res
-End Function
+End Sub
 
-Function load_lang_data(dir, ByRef vcxproj, ByRef files)
-	Dim res, folder, file, first_time
-	res = ""
+Sub load_lang_data(dir, ByRef vcxproj, ByRef files)
+	Dim folder, file, first_time
 	Set folder = FSO.GetFolder(dir)
 	For Each file In folder.Files
 		file = FSO.GetFileName(file)
 		If file <> "english.txt" And FSO.GetExtensionName(file) = "txt" Then
 			file = Left(file, Len(file) - 4)
 			If first_time <> 0 Then
-				res = res & vbCrLf
 				vcxproj = vcxproj & vbCrLf
 				files = files & vbCrLf
 			Else
 				first_time = 1
 			End If
-			res = res & _
-			"			<File" & vbCrLf & _
-			"				RelativePath=" & Chr(34) & "..\src\lang\" & file & ".txt" & Chr(34) & vbCrLf & _
-			"				>" & vbCrLf & _
-			"				<FileConfiguration" & vbCrLf & _
-			"					Name=" & Chr(34) & "Debug|Win32" & Chr(34) & vbCrLf & _
-			"					>" & vbCrLf & _
-			"					<Tool" & vbCrLf & _
-			"						Name=" & Chr(34) & "VCCustomBuildTool" & Chr(34) & vbCrLf & _
-			"						Description=" & Chr(34) & "Generating " & file & " language file" & Chr(34) & vbCrLf & _
-			"						CommandLine=" & Chr(34) & "..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;" & Chr(34) & vbCrLf & _
-			"						AdditionalDependencies=" & Chr(34) & "..\src\lang\english.txt;..\objs\strgen\strgen.exe" & Chr(34) & vbCrLf & _
-			"						Outputs=" & Chr(34) & "..\bin\lang\" & file & ".lng" & Chr(34) & vbCrLf & _
-			"					/>" & vbCrLf & _
-			"				</FileConfiguration>" & vbCrLf & _
-			"			</File>"
 			vcxproj = vcxproj & _
 			"    <CustomBuild Include=" & Chr(34) & "..\src\lang\" & file & ".txt" & Chr(34) & ">" & vbCrLf & _
 			"      <Message Condition=" & Chr(34) & "'$(Configuration)|$(Platform)'=='Debug|Win32'" & Chr(34) & ">Generating " & file & " language file</Message>" & vbCrLf & _
@@ -295,29 +253,21 @@ Function load_lang_data(dir, ByRef vcxproj, ByRef files)
 			"    </CustomBuild>"
 		End If
 	Next
-	load_lang_data = res
-End Function
+End Sub
 
-Function load_settings_data(dir, ByRef vcxproj, ByRef command, ByRef files)
-	Dim res, folder, file, first_time
-	res = ""
+Sub load_settings_data(dir, ByRef vcxproj, ByRef command, ByRef files)
+	Dim folder, file, first_time
 	command = "..\objs\settings\settings_gen.exe -o ..\objs\settings\table\settings.h -b ..\src\table\settings.h.preamble -a ..\src\table\settings.h.postamble"
 	Set folder = FSO.GetFolder(dir)
 	For Each file In folder.Files
 		file = FSO.GetFileName(file)
 		If FSO.GetExtensionName(file) = "ini" Then
 			if first_time <> 0 Then
-				res = res & vbCrLf
 				vcxproj = vcxproj & vbCrLf
 				files = files & vbCrLf
 			Else
 				first_time = 1
 			End If
-			res = res & _
-			"		<File" & vbCrLf & _
-			"			RelativePath=" & Chr(34) & "..\src\table\" & file & Chr(34) & vbCrLf & _
-			"			>" & vbCrLf & _
-			"		</File>"
 			vcxproj = vcxproj & _
 			"    <None Include=" & Chr(34) & "..\src\table\" & file & Chr(34) & " />"
 			command = command & " ..\src\table\" & file
@@ -327,8 +277,49 @@ Function load_settings_data(dir, ByRef vcxproj, ByRef command, ByRef files)
 			"    </None>"
 		End If
 	Next
-	load_settings_data = res
-End Function
+End Sub
+
+Sub load_baseset_data(dir, langdir, ByRef vcxproj, ByRef files, ByRef langs)
+	Dim folder, file, ext, first_time
+	Set folder = FSO.GetFolder(langdir)
+	langs = "    <Langs>"
+	For Each file In folder.Files
+		If first_time <> 0 Then
+			langs = langs & ";"
+		Else
+			first_time = 1
+		End If
+		file = FSO.GetFileName(file)
+		ext = FSO.GetExtensionName(file)
+		langs = langs & "..\src\lang\" & file
+	Next
+	langs = langs & "</Langs>"
+	first_time = 0
+	Set folder = FSO.GetFolder(dir)
+	For Each file In folder.Files
+		file = FSO.GetFileName(file)
+		ext = FSO.GetExtensionName(file)
+		If ext = "obm" Or ext = "obg" Or ext = "obs" Then
+			If first_time <> 0 Then
+				vcxproj = vcxproj & vbCrLf
+				files = files & vbCrLf
+			Else
+				first_time = 1
+			End If
+			vcxproj = vcxproj & _
+			"    <CustomBuild Include=" & Chr(34) & "..\media\baseset\" & file & Chr(34) & ">" & vbCrLf & _
+			"      <Message Condition=" & Chr(34) & "'$(Configuration)|$(Platform)'=='Debug|Win32'" & Chr(34) & ">Generating " & file & " baseset metadata file</Message>" & vbCrLf & _
+			"      <Command Condition=" & Chr(34) & "'$(Configuration)|$(Platform)'=='Debug|Win32'" & Chr(34) & ">cscript //nologo ..\media\baseset\translations.vbs " & Chr(34) & "%(FullPath)" & Chr(34) & " " & Chr(34) & "$(OutputPath)" & file & Chr(34) & " ..\src\lang ..\bin\baseset\orig_extra.grf</Command>" & vbCrLf & _
+			"      <AdditionalInputs Condition=" & Chr(34) & "'$(Configuration)|$(Platform)'=='Debug|Win32'" & Chr(34) & ">$(Langs);..\bin\baseset\orig_extra.grf;%(AdditionalInputs)</AdditionalInputs>" & vbCrLf & _
+			"      <Outputs Condition=" & Chr(34) & "'$(Configuration)|$(Platform)'=='Debug|Win32'" & Chr(34) & ">..\bin\baseset\" & file & ";%(Outputs)</Outputs>" & vbCrLf & _
+			"    </CustomBuild>"
+			files = files & _
+			"    <CustomBuild Include=" & Chr(34) & "..\media\baseset\" & file & Chr(34) & ">" & vbCrLf & _
+			"      <Filter>Baseset Metadata</Filter>" & vbCrLf & _
+			"    </CustomBuild>"
+		End If
+	Next
+End Sub
 
 Sub generate(data, dest, data2)
 	Dim srcfile, destfile, line
@@ -381,35 +372,38 @@ End If
 safety_check ROOT_DIR & "/source.list"
 headers_check ROOT_DIR & "/source.list", ROOT_DIR & "\src\" ' Backslashes needed for DoFiles
 
-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
+Dim openttdvcxproj, openttdfilters, openttdfiles
+load_main_data ROOT_DIR & "/source.list", openttdvcxproj, openttdfilters, openttdfiles
 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
 generate openttdfiles, ROOT_DIR & "/projects/openttd_vs141.vcxproj.filters", openttdfilters
+generate openttdvcxproj, ROOT_DIR & "/projects/openttd_vs142.vcxproj", Null
+generate openttdfiles, ROOT_DIR & "/projects/openttd_vs142.vcxproj.filters", openttdfilters
 
-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
+Dim langvcxproj, langfiles
+load_lang_data ROOT_DIR & "/src/lang", langvcxproj, langfiles
 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
 generate langfiles, ROOT_DIR & "/projects/langs_vs141.vcxproj.filters", Null
+generate langvcxproj, ROOT_DIR & "/projects/langs_vs142.vcxproj", Null
+generate langfiles, ROOT_DIR & "/projects/langs_vs142.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
+Dim settingsvcxproj, settingscommand, settingsfiles
+load_settings_data ROOT_DIR & "/src/table", settingsvcxproj, settingscommand, settingsfiles
 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
 generate settingsfiles, ROOT_DIR & "/projects/settings_vs141.vcxproj.filters", Null
+generate settingsvcxproj, ROOT_DIR & "/projects/settings_vs142.vcxproj", settingscommand
+generate settingsfiles, ROOT_DIR & "/projects/settings_vs142.vcxproj.filters", Null
+
+Dim basesetvcxproj, basesetfiles, basesetlangs
+load_baseset_data ROOT_DIR & "/media/baseset", ROOT_DIR & "/src/lang", basesetvcxproj, basesetfiles, basesetlangs
+generate basesetvcxproj, ROOT_DIR & "/projects/basesets_vs140.vcxproj", basesetlangs
+generate basesetfiles, ROOT_DIR & "/projects/basesets_vs140.vcxproj.filters", Null
+generate basesetvcxproj, ROOT_DIR & "/projects/basesets_vs141.vcxproj", basesetlangs
+generate basesetfiles, ROOT_DIR & "/projects/basesets_vs141.vcxproj.filters", Null
+generate settingsvcxproj, ROOT_DIR & "/projects/basesets_vs142.vcxproj", settingscommand
+generate settingsfiles, ROOT_DIR & "/projects/basesets_vs142.vcxproj.filters", Null

projects/generate_vs140.vcxproj

@@ -31,10 +31,9 @@
       <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>
+</Project>

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>

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">

projects/openttd_vs140.sln

@@ -4,10 +4,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 VisualStudioVersion = 14.0.23107.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openttd", "openttd_vs140.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_vs140.vcxproj", "{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}"
 EndProject
@@ -18,12 +14,13 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "generate", "generate_vs140.vcxproj", "{2F31FD79-D1AC-43C4-89F3-B0D5E4E53E34}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "settings", "settings_vs140.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_vs140.vcxproj", "{E9548DE9-F089-49B7-93A6-30BE2CC311C7}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "regression", "regression_vs140.vcxproj", "{4712B013-437D-42CE-947F-DEBABA15261F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "basesets", "basesets_vs140.vcxproj", "{E12E77CA-C0F1-4ADA-943F-4929274249D3}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -84,6 +81,18 @@ 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
+		{E12E77CA-C0F1-4ADA-943F-4929274249D3}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E12E77CA-C0F1-4ADA-943F-4929274249D3}.Debug|Win32.Build.0 = Debug|Win32
+		{E12E77CA-C0F1-4ADA-943F-4929274249D3}.Debug|x64.ActiveCfg = Debug|Win32
+		{E12E77CA-C0F1-4ADA-943F-4929274249D3}.Debug|x64.Build.0 = Debug|Win32
+		{E12E77CA-C0F1-4ADA-943F-4929274249D3}.Release|Win32.ActiveCfg = Debug|Win32
+		{E12E77CA-C0F1-4ADA-943F-4929274249D3}.Release|Win32.Build.0 = Debug|Win32
+		{E12E77CA-C0F1-4ADA-943F-4929274249D3}.Release|x64.ActiveCfg = Debug|Win32
+		{E12E77CA-C0F1-4ADA-943F-4929274249D3}.Release|x64.Build.0 = Debug|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

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";%(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>
@@ -152,8 +154,12 @@
       <MinimumRequiredVersion>5.01</MinimumRequiredVersion>
     </Link>
     <Manifest>
+      <AdditionalManifestFiles>os_versions.manifest</AdditionalManifestFiles>
       <EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
     </Manifest>
+    <PostBuildEvent>
+      <Command>copy "$(OutDir)$(TargetName)$(TargetExt)" "$(SolutionDir)..\bin\$(TargetName)$(TargetExt)"</Command>
+    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Midl>
@@ -166,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>
@@ -188,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>
@@ -202,8 +208,12 @@
       <MinimumRequiredVersion>5.01</MinimumRequiredVersion>
     </Link>
     <Manifest>
+      <AdditionalManifestFiles>os_versions.manifest</AdditionalManifestFiles>
       <EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
     </Manifest>
+    <PostBuildEvent>
+      <Command>copy "$(OutDir)$(TargetName)$(TargetExt)" "$(SolutionDir)..\bin\$(TargetName)$(TargetExt)"</Command>
+    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Midl>
@@ -220,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;%(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>
@@ -251,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>
@@ -264,8 +274,12 @@
       <MinimumRequiredVersion>5.02</MinimumRequiredVersion>
     </Link>
     <Manifest>
+      <AdditionalManifestFiles>os_versions.manifest</AdditionalManifestFiles>
       <EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
     </Manifest>
+    <PostBuildEvent>
+      <Command>copy "$(OutDir)$(TargetName)$(TargetExt)" "$(SolutionDir)..\bin\$(TargetName)$(TargetExt)"</Command>
+    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Midl>
@@ -279,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>
@@ -305,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>
@@ -316,8 +330,12 @@
       <MinimumRequiredVersion>5.02</MinimumRequiredVersion>
     </Link>
     <Manifest>
+      <AdditionalManifestFiles>os_versions.manifest</AdditionalManifestFiles>
       <EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
     </Manifest>
+    <PostBuildEvent>
+      <Command>copy "$(OutDir)$(TargetName)$(TargetExt)" "$(SolutionDir)..\bin\$(TargetName)$(TargetExt)"</Command>
+    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\src\airport.cpp" />
@@ -486,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" />
@@ -502,6 +521,7 @@
     <ClInclude Include="..\src\group_gui.h" />
     <ClInclude Include="..\src\group_type.h" />
     <ClInclude Include="..\src\gui.h" />
+    <ClInclude Include="..\src\guitimer_func.h" />
     <ClInclude Include="..\src\heightmap.h" />
     <ClInclude Include="..\src\highscore.h" />
     <ClInclude Include="..\src\hotkeys.h" />
@@ -574,6 +594,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" />
@@ -634,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" />
@@ -687,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" />
@@ -732,6 +756,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" />
@@ -793,6 +818,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" />
@@ -1027,6 +1053,8 @@
     <ClInclude Include="..\src\script\api\script_cargo.hpp" />
     <ClInclude Include="..\src\script\api\script_cargolist.hpp" />
     <ClInclude Include="..\src\script\api\script_cargomonitor.hpp" />
+    <ClInclude Include="..\src\script\api\script_client.hpp" />
+    <ClInclude Include="..\src\script\api\script_clientlist.hpp" />
     <ClInclude Include="..\src\script\api\script_company.hpp" />
     <ClInclude Include="..\src\script\api\script_companymode.hpp" />
     <ClInclude Include="..\src\script\api\script_controller.hpp" />
@@ -1092,6 +1120,8 @@
     <ClCompile Include="..\src\script\api\script_cargo.cpp" />
     <ClCompile Include="..\src\script\api\script_cargolist.cpp" />
     <ClCompile Include="..\src\script\api\script_cargomonitor.cpp" />
+    <ClCompile Include="..\src\script\api\script_client.cpp" />
+    <ClCompile Include="..\src\script\api\script_clientlist.cpp" />
     <ClCompile Include="..\src\script\api\script_company.cpp" />
     <ClCompile Include="..\src\script\api\script_companymode.cpp" />
     <ClCompile Include="..\src\script\api\script_controller.cpp" />
@@ -1147,6 +1177,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" />
@@ -1169,8 +1201,8 @@
     <ClInclude Include="..\src\blitter\8bpp_optimized.hpp" />
     <ClCompile Include="..\src\blitter\8bpp_simple.cpp" />
     <ClInclude Include="..\src\blitter\8bpp_simple.hpp" />
-    <ClCompile Include="..\src\blitter\base.cpp" />
     <ClInclude Include="..\src\blitter\base.hpp" />
+    <ClInclude Include="..\src\blitter\common.hpp" />
     <ClInclude Include="..\src\blitter\factory.hpp" />
     <ClCompile Include="..\src\blitter\null.cpp" />
     <ClInclude Include="..\src\blitter\null.hpp" />
@@ -1291,25 +1323,36 @@
     <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" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\media\openttd.ico" />
-    <None Include="..\readme.txt" />
+    <None Include="..\README.md" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="langs_vs140.vcxproj">
       <Project>{0f066b23-18df-4284-8265-f4a5e7e3b966}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
+    <ProjectReference Include="settingsgen_vs140.vcxproj">
+      <Project>{e9548de9-f089-49b7-93a6-30be2cc311c7}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="settings_vs140.vcxproj">
+      <Project>{0817f629-589e-4a3b-b81a-8647bc571e35}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
     <ProjectReference Include="strgen_vs140.vcxproj">
       <Project>{a133a442-bd0a-4ade-b117-ad7545e4bdd1}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
@@ -1318,6 +1361,10 @@
       <Project>{1a2b3c5e-1c23-41a5-9c9b-acba2aa75fec}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
+    <ProjectReference Include="basesets_vs140.vcxproj">
+      <Project>{e12e77ca-c0f1-4ada-943f-4929274249d3}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>

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>
@@ -648,6 +651,9 @@
     <ClInclude Include="..\src\gui.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\guitimer_func.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\heightmap.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -864,6 +870,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>
@@ -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>
@@ -1338,6 +1356,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 +1542,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>
@@ -2223,6 +2247,12 @@
     <ClInclude Include="..\src\script\api\script_cargomonitor.hpp">
       <Filter>Script API</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\script\api\script_client.hpp">
+      <Filter>Script API</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\script\api\script_clientlist.hpp">
+      <Filter>Script API</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\script\api\script_company.hpp">
       <Filter>Script API</Filter>
     </ClInclude>
@@ -2418,6 +2448,12 @@
     <ClCompile Include="..\src\script\api\script_cargomonitor.cpp">
       <Filter>Script API Implementation</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\script\api\script_client.cpp">
+      <Filter>Script API Implementation</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\script\api\script_clientlist.cpp">
+      <Filter>Script API Implementation</Filter>
+    </ClCompile>
     <ClCompile Include="..\src\script\api\script_company.cpp">
       <Filter>Script API Implementation</Filter>
     </ClCompile>
@@ -2583,6 +2619,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>
@@ -2649,12 +2691,12 @@
     <ClInclude Include="..\src\blitter\8bpp_simple.hpp">
       <Filter>Blitters</Filter>
     </ClInclude>
-    <ClCompile Include="..\src\blitter\base.cpp">
-      <Filter>Blitters</Filter>
-    </ClCompile>
     <ClInclude Include="..\src\blitter\base.hpp">
       <Filter>Blitters</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\blitter\common.hpp">
+      <Filter>Blitters</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\blitter\factory.hpp">
       <Filter>Blitters</Filter>
     </ClInclude>
@@ -3015,6 +3057,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>
@@ -3027,12 +3072,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>
@@ -3045,6 +3096,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="..\media\openttd.ico" />
-    <None Include="..\readme.txt" />
+    <None Include="..\README.md" />
   </ItemGroup>
 </Project>

projects/openttd_vs140.vcxproj.filters.in

@@ -8,6 +8,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="..\media\openttd.ico" />
-    <None Include="..\readme.txt" />
+    <None Include="..\README.md" />
   </ItemGroup>
 </Project>

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";%(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>
@@ -152,8 +154,12 @@
       <MinimumRequiredVersion>5.01</MinimumRequiredVersion>
     </Link>
     <Manifest>
+      <AdditionalManifestFiles>os_versions.manifest</AdditionalManifestFiles>
       <EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
     </Manifest>
+    <PostBuildEvent>
+      <Command>copy "$(OutDir)$(TargetName)$(TargetExt)" "$(SolutionDir)..\bin\$(TargetName)$(TargetExt)"</Command>
+    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Midl>
@@ -166,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>
@@ -188,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>
@@ -202,8 +208,12 @@
       <MinimumRequiredVersion>5.01</MinimumRequiredVersion>
     </Link>
     <Manifest>
+      <AdditionalManifestFiles>os_versions.manifest</AdditionalManifestFiles>
       <EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
     </Manifest>
+    <PostBuildEvent>
+      <Command>copy "$(OutDir)$(TargetName)$(TargetExt)" "$(SolutionDir)..\bin\$(TargetName)$(TargetExt)"</Command>
+    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Midl>
@@ -220,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;%(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>
@@ -251,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>
@@ -264,8 +274,12 @@
       <MinimumRequiredVersion>5.02</MinimumRequiredVersion>
     </Link>
     <Manifest>
+      <AdditionalManifestFiles>os_versions.manifest</AdditionalManifestFiles>
       <EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
     </Manifest>
+    <PostBuildEvent>
+      <Command>copy "$(OutDir)$(TargetName)$(TargetExt)" "$(SolutionDir)..\bin\$(TargetName)$(TargetExt)"</Command>
+    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Midl>
@@ -279,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>
@@ -305,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>
@@ -316,21 +330,33 @@
       <MinimumRequiredVersion>5.02</MinimumRequiredVersion>
     </Link>
     <Manifest>
+      <AdditionalManifestFiles>os_versions.manifest</AdditionalManifestFiles>
       <EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
     </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.txt" />
+    <None Include="..\README.md" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="langs_vs140.vcxproj">
       <Project>{0f066b23-18df-4284-8265-f4a5e7e3b966}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
+    <ProjectReference Include="settingsgen_vs140.vcxproj">
+      <Project>{e9548de9-f089-49b7-93a6-30be2cc311c7}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="settings_vs140.vcxproj">
+      <Project>{0817f629-589e-4a3b-b81a-8647bc571e35}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
     <ProjectReference Include="strgen_vs140.vcxproj">
       <Project>{a133a442-bd0a-4ade-b117-ad7545e4bdd1}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
@@ -339,6 +365,10 @@
       <Project>{1a2b3c5e-1c23-41a5-9c9b-acba2aa75fec}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
+    <ProjectReference Include="basesets_vs140.vcxproj">
+      <Project>{e12e77ca-c0f1-4ada-943f-4929274249d3}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>

projects/settings_vs140.vcxproj

@@ -48,6 +48,12 @@
     <None Include="..\src\table\settings.h.postamble" />
     <None Include="..\src\table\settings.h.preamble" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="settingsgen_vs140.vcxproj">
+      <Project>{e9548de9-f089-49b7-93a6-30be2cc311c7}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

projects/settings_vs140.vcxproj.in

@@ -42,6 +42,12 @@
     <None Include="..\src\table\settings.h.postamble" />
     <None Include="..\src\table\settings.h.preamble" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="settingsgen_vs140.vcxproj">
+      <Project>{e9548de9-f089-49b7-93a6-30be2cc311c7}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

projects/settingsgen_vs140.vcxproj

@@ -80,4 +80,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

projects/strgen_vs140.vcxproj

@@ -92,4 +92,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

projects/version_vs140.vcxproj

@@ -39,4 +39,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>