msvc: add x86_64 build support

This updates all the contrib projects for this support
as well.

Signed-off-by: Steven Noonan <steven@uplinklabs.net>

15 files changed, 932 insertions, 71 deletions

diff --git a/crawl-ref/source/AppHdr.cc b/crawl-ref/source/AppHdr.cc
index 0b84e03d67..63d4e0f0c2 100644
--- a/crawl-ref/source/AppHdr.cc
+++ b/crawl-ref/source/AppHdr.cc
@@ -1,3 +1,19 @@
 
 /* This file is for MSVC to generate a precompiled header */
 #include "AppHdr.h"
+
+/* Make setting up the link trivial on MSVC */
+#ifdef TARGET_COMPILER_VC
+    #pragma comment (lib, "pcre.lib")
+    #pragma comment (lib, "lua.lib")
+    #pragma comment (lib, "sqlite.lib")
+        #ifdef USE_TILE
+            #pragma comment (lib, "freetype.lib")
+            #pragma comment (lib, "SDL.lib")
+            #pragma comment (lib, "SDL_image.lib")
+            #pragma comment (lib, "libpng.lib")
+            #pragma comment (lib, "zlib.lib")
+            #pragma comment (lib, "dxguid.lib")
+            #pragma comment (lib, "winmm.lib")
+        #endif
+#endif
diff --git a/crawl-ref/source/AppHdr.h b/crawl-ref/source/AppHdr.h
index 5f2cf6fa0c..9ec6d523fa 100644
--- a/crawl-ref/source/AppHdr.h
+++ b/crawl-ref/source/AppHdr.h
@@ -22,8 +22,11 @@
 #include "platform.h"
 
 #ifdef TARGET_COMPILER_VC
-/* Disable warning about the way VC handles the throw() specifier */
-#pragma warning (disable: 4290)
+/* Disable warning about:
+   4290: the way VC handles the throw() specifier
+   4267: "possible loss of data" when switching data types without a cast
+ */
+#pragma warning (disable: 4290 4267)
 /* Don't define min and max as macros, define them via STL */
 #define NOMINMAX
 #endif
diff --git a/crawl-ref/source/MSVC/Common.vsprops b/crawl-ref/source/MSVC/Common.vsprops
index 19345f5858..754809a55e 100644
--- a/crawl-ref/source/MSVC/Common.vsprops
+++ b/crawl-ref/source/MSVC/Common.vsprops
@@ -11,4 +11,8 @@
 		PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
 		MinimalRebuild="true"

 	/>

+	<Tool
+		Name="VCLinkerTool"
+		AdditionalLibraryDirectories="&quot;$(ProjectDir)\..\contrib\bin\8.0\$(PlatformName)&quot;"
+	/>
 </VisualStudioPropertySheet>

diff --git a/crawl-ref/source/MSVC/Tiles.vsprops b/crawl-ref/source/MSVC/Tiles.vsprops
index 6ace6166ef..2fbd52783a 100644
--- a/crawl-ref/source/MSVC/Tiles.vsprops
+++ b/crawl-ref/source/MSVC/Tiles.vsprops
@@ -11,7 +11,7 @@
 	/>

 	<Tool

 		Name="VCLinkerTool"

-		AdditionalDependencies="SDL.lib SDL_image.lib SDLmain.lib libpng.lib zlib.lib freetype.lib opengl32.lib glu32.lib"

+		AdditionalDependencies="SDL.lib SDL_image.lib SDLmain.lib libpng.lib zlib.lib freetype.lib opengl32.lib glu32.lib winmm.lib dxguid.lib"
 		AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\contrib\bin\8.0\$(PlatformName)&quot;"
 	/>

 </VisualStudioPropertySheet>

diff --git a/crawl-ref/source/MSVC/crawl-ref.sln b/crawl-ref/source/MSVC/crawl-ref.sln
index 5b3feb698e..0d9ecb650e 100644
--- a/crawl-ref/source/MSVC/crawl-ref.sln
+++ b/crawl-ref/source/MSVC/crawl-ref.sln
@@ -11,27 +11,47 @@ EndProject
 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug Console|Win32 = Debug Console|Win32

+		Debug Console|x64 = Debug Console|x64
 		Debug Tiles|Win32 = Debug Tiles|Win32

+		Debug Tiles|x64 = Debug Tiles|x64
 		Release Console|Win32 = Release Console|Win32

+		Release Console|x64 = Release Console|x64
 		Release Tiles|Win32 = Release Tiles|Win32

+		Release Tiles|x64 = Release Tiles|x64
 	EndGlobalSection

 	GlobalSection(ProjectConfigurationPlatforms) = postSolution

 		{3189AF12-90EF-4D3E-BFEC-4AB90D7D32DA}.Debug Console|Win32.ActiveCfg = Debug Console|Win32

 		{3189AF12-90EF-4D3E-BFEC-4AB90D7D32DA}.Debug Console|Win32.Build.0 = Debug Console|Win32

+		{3189AF12-90EF-4D3E-BFEC-4AB90D7D32DA}.Debug Console|x64.ActiveCfg = Debug Console|x64
+		{3189AF12-90EF-4D3E-BFEC-4AB90D7D32DA}.Debug Console|x64.Build.0 = Debug Console|x64
 		{3189AF12-90EF-4D3E-BFEC-4AB90D7D32DA}.Debug Tiles|Win32.ActiveCfg = Debug Tiles|Win32

 		{3189AF12-90EF-4D3E-BFEC-4AB90D7D32DA}.Debug Tiles|Win32.Build.0 = Debug Tiles|Win32

+		{3189AF12-90EF-4D3E-BFEC-4AB90D7D32DA}.Debug Tiles|x64.ActiveCfg = Debug Tiles|x64
+		{3189AF12-90EF-4D3E-BFEC-4AB90D7D32DA}.Debug Tiles|x64.Build.0 = Debug Tiles|x64
 		{3189AF12-90EF-4D3E-BFEC-4AB90D7D32DA}.Release Console|Win32.ActiveCfg = Release Console|Win32

 		{3189AF12-90EF-4D3E-BFEC-4AB90D7D32DA}.Release Console|Win32.Build.0 = Release Console|Win32

+		{3189AF12-90EF-4D3E-BFEC-4AB90D7D32DA}.Release Console|x64.ActiveCfg = Release Console|x64
+		{3189AF12-90EF-4D3E-BFEC-4AB90D7D32DA}.Release Console|x64.Build.0 = Release Console|x64
 		{3189AF12-90EF-4D3E-BFEC-4AB90D7D32DA}.Release Tiles|Win32.ActiveCfg = Release Tiles|Win32

 		{3189AF12-90EF-4D3E-BFEC-4AB90D7D32DA}.Release Tiles|Win32.Build.0 = Release Tiles|Win32

+		{3189AF12-90EF-4D3E-BFEC-4AB90D7D32DA}.Release Tiles|x64.ActiveCfg = Release Tiles|x64
+		{3189AF12-90EF-4D3E-BFEC-4AB90D7D32DA}.Release Tiles|x64.Build.0 = Release Tiles|x64
 		{DAE92A45-087B-445B-8E94-BA864173A73F}.Debug Console|Win32.ActiveCfg = Debug|Win32

 		{DAE92A45-087B-445B-8E94-BA864173A73F}.Debug Console|Win32.Build.0 = Debug|Win32

+		{DAE92A45-087B-445B-8E94-BA864173A73F}.Debug Console|x64.ActiveCfg = Debug|x64
+		{DAE92A45-087B-445B-8E94-BA864173A73F}.Debug Console|x64.Build.0 = Debug|x64
 		{DAE92A45-087B-445B-8E94-BA864173A73F}.Debug Tiles|Win32.ActiveCfg = Debug|Win32

 		{DAE92A45-087B-445B-8E94-BA864173A73F}.Debug Tiles|Win32.Build.0 = Debug|Win32

+		{DAE92A45-087B-445B-8E94-BA864173A73F}.Debug Tiles|x64.ActiveCfg = Debug|x64
+		{DAE92A45-087B-445B-8E94-BA864173A73F}.Debug Tiles|x64.Build.0 = Debug|x64
 		{DAE92A45-087B-445B-8E94-BA864173A73F}.Release Console|Win32.ActiveCfg = Release|Win32

 		{DAE92A45-087B-445B-8E94-BA864173A73F}.Release Console|Win32.Build.0 = Release|Win32

+		{DAE92A45-087B-445B-8E94-BA864173A73F}.Release Console|x64.ActiveCfg = Release|x64
+		{DAE92A45-087B-445B-8E94-BA864173A73F}.Release Console|x64.Build.0 = Release|x64
 		{DAE92A45-087B-445B-8E94-BA864173A73F}.Release Tiles|Win32.ActiveCfg = Release|Win32

 		{DAE92A45-087B-445B-8E94-BA864173A73F}.Release Tiles|Win32.Build.0 = Release|Win32

+		{DAE92A45-087B-445B-8E94-BA864173A73F}.Release Tiles|x64.ActiveCfg = Release|x64
+		{DAE92A45-087B-445B-8E94-BA864173A73F}.Release Tiles|x64.Build.0 = Release|x64
 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

diff --git a/crawl-ref/source/MSVC/crawl.vcproj b/crawl-ref/source/MSVC/crawl.vcproj
index 95d87f1520..009f95b82a 100644
--- a/crawl-ref/source/MSVC/crawl.vcproj
+++ b/crawl-ref/source/MSVC/crawl.vcproj
@@ -11,17 +11,19 @@
 		<Platform

 			Name="Win32"

 		/>

+		<Platform
+			Name="x64"
+		/>
 	</Platforms>

 	<ToolFiles>

 	</ToolFiles>

 	<Configurations>

-		<Configuration

-			Name="Debug Console|Win32"

-			OutputDirectory="$(SolutionDir)\.."

-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"

+		<Configuration
+			Name="Debug Console|Win32"
+			OutputDirectory="$(SolutionDir)\.."
+			ConfigurationType="1"
 			InheritedPropertySheets=".\Console.vsprops;.\Debug.vsprops;.\Common.vsprops"
-			CharacterSet="0"

+			CharacterSet="0"
 			WholeProgramOptimization="0"

 			>

 			<Tool

@@ -65,6 +67,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				LinkIncremental="2"

+				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"

 				SubSystem="1"

 				TargetMachine="1"

@@ -140,6 +143,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				LinkIncremental="1"

+				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"

 				SubSystem="1"

 				OptimizeReferences="2"

@@ -218,12 +222,13 @@
 				Name="VCPreLinkEventTool"

 			/>

 			<Tool

-				Name="VCLinkerTool"

+				Name="VCLinkerTool"
 				AdditionalDependencies="SDL.lib SDL_image.lib libpng.lib lua.lib pcre.lib sqlite.lib zlib.lib"
-				LinkIncremental="2"

-				GenerateDebugInformation="true"

+				LinkIncremental="2"
+				AdditionalLibraryDirectories=""
+				GenerateDebugInformation="true"
 				SubSystem="2"
-				TargetMachine="1"

+				TargetMachine="1"
 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -257,13 +262,13 @@
 			InheritedPropertySheets=".\Tiles.vsprops;.\Release.vsprops;.\Common.vsprops"
 			CharacterSet="0"

 			WholeProgramOptimization="0"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-				CommandLine="cd $(ProjectDir)\..&#x0D;&#x0A;perl util/gen-cflg.pl compflag.h &quot;&lt;unavailable&gt;&quot; &quot;&lt;unavailable&gt;&quot; &quot;&lt;unavailable&gt;&quot;&#x0D;&#x0A;perl util/gen_ver.pl build.h"
-			/>

-			<Tool

-				Name="VCCustomBuildTool"

+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine="cd $(ProjectDir)\..&#x0D;&#x0A;perl util/gen-cflg.pl compflag.h &quot;&lt;unavailable&gt;&quot; &quot;&lt;unavailable&gt;&quot; &quot;&lt;unavailable&gt;&quot;&#x0D;&#x0A;perl util/gen_ver.pl build.h&#x0D;&#x0A;"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
 			/>

 			<Tool

 				Name="VCXMLDataGeneratorTool"

@@ -295,13 +300,13 @@
 				Name="VCPreLinkEventTool"

 			/>

 			<Tool

-				Name="VCLinkerTool"

+				Name="VCLinkerTool"
 				AdditionalDependencies="SDL.lib SDL_image.lib libpng.lib lua.lib pcre.lib sqlite.lib zlib.lib"
-				LinkIncremental="1"

-				AdditionalLibraryDirectories="$(ProjectDir)\..\contrib\bin\8.0"
-				GenerateDebugInformation="true"

+				LinkIncremental="1"
+				AdditionalLibraryDirectories=""
+				GenerateDebugInformation="true"
 				SubSystem="2"
-				OptimizeReferences="2"

+				OptimizeReferences="2"
 				EnableCOMDATFolding="2"

 				TargetMachine="1"

 			/>

@@ -330,6 +335,327 @@
 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

+		<Configuration
+			Name="Debug Console|x64"
+			OutputDirectory="$(SolutionDir)\.."
+			ConfigurationType="1"
+			InheritedPropertySheets=".\Console.vsprops;.\Debug.vsprops;.\Common.vsprops"
+			CharacterSet="0"
+			WholeProgramOptimization="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".;..;../contrib/lua/src;../contrib/sqlite;../contrib/pcre;../rltiles"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;_USE_MATH_DEFINES"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="AppHdr.h"
+				WarningLevel="3"
+				WarnAsError="false"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories=""
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release Console|x64"
+			OutputDirectory="$(SolutionDir)\.."
+			ConfigurationType="1"
+			InheritedPropertySheets=".\Console.vsprops;.\Release.vsprops;.\Common.vsprops"
+			CharacterSet="0"
+			WholeProgramOptimization="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories=".;..;../contrib/lua/src;../contrib/sqlite;../contrib/pcre;../rltiles"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;_USE_MATH_DEFINES"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="AppHdr.h"
+				WarningLevel="3"
+				WarnAsError="false"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories=""
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug Tiles|x64"
+			OutputDirectory="$(SolutionDir)\.."
+			ConfigurationType="1"
+			InheritedPropertySheets=".\Tiles.vsprops;.\Debug.vsprops;.\Common.vsprops"
+			CharacterSet="0"
+			WholeProgramOptimization="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".;..;../contrib/lua/src;../contrib/sqlite;../contrib/pcre;../rltiles"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;_USE_MATH_DEFINES"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="AppHdr.h"
+				WarningLevel="3"
+				WarnAsError="false"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="SDL.lib SDL_image.lib libpng.lib lua.lib pcre.lib sqlite.lib zlib.lib"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories=""
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release Tiles|x64"
+			OutputDirectory="$(SolutionDir)\.."
+			ConfigurationType="1"
+			InheritedPropertySheets=".\Tiles.vsprops;.\Release.vsprops;.\Common.vsprops"
+			CharacterSet="0"
+			WholeProgramOptimization="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine="cd $(ProjectDir)\..&#x0D;&#x0A;perl util/gen-cflg.pl compflag.h &quot;&lt;unavailable&gt;&quot; &quot;&lt;unavailable&gt;&quot; &quot;&lt;unavailable&gt;&quot;&#x0D;&#x0A;perl util/gen_ver.pl build.h&#x0D;&#x0A;"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories=".;..;../contrib/lua/src;../contrib/sqlite;../contrib/pcre;../rltiles"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;_USE_MATH_DEFINES"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="AppHdr.h"
+				WarningLevel="3"
+				WarnAsError="false"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="SDL.lib SDL_image.lib libpng.lib lua.lib pcre.lib sqlite.lib zlib.lib"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories=""
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
 	</Configurations>

 	<References>

 	</References>

@@ -397,6 +723,38 @@
 					UsePrecompiledHeader="1"

 				/>

 			</FileConfiguration>

+			<FileConfiguration
+				Name="Debug Console|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="1"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Console|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="1"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Debug Tiles|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="1"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Tiles|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="1"
+				/>
+			</FileConfiguration>
 		</File>

 		<File

 			RelativePath="..\AppHdr.h"

@@ -529,6 +887,38 @@
 					UsePrecompiledHeader="0"

 				/>

 			</FileConfiguration>

+			<FileConfiguration
+				Name="Debug Console|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Console|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Debug Tiles|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Tiles|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
 		</File>

 		<File

 			RelativePath="..\database.h"

@@ -909,6 +1299,38 @@
 					UsePrecompiledHeader="0"

 				/>

 			</FileConfiguration>

+			<FileConfiguration
+				Name="Debug Console|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Console|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Debug Tiles|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Tiles|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
 		</File>

 		<File

 			RelativePath="..\prebuilt\levcomp.tab.cc"

@@ -945,6 +1367,38 @@
 					UsePrecompiledHeader="0"

 				/>

 			</FileConfiguration>

+			<FileConfiguration
+				Name="Debug Console|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Console|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Debug Tiles|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Tiles|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
 		</File>

 		<File

 			RelativePath="..\prebuilt\levcomp.tab.h"

@@ -1001,6 +1455,38 @@
 					UsePrecompiledHeader="2"

 				/>

 			</FileConfiguration>

+			<FileConfiguration
+				Name="Debug Console|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="2"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Console|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="2"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Debug Tiles|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="2"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Tiles|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="2"
+				/>
+			</FileConfiguration>
 		</File>

 		<File

 			RelativePath="..\libw32c.h"

@@ -1193,6 +1679,38 @@
 					UsePrecompiledHeader="0"

 				/>

 			</FileConfiguration>

+			<FileConfiguration
+				Name="Debug Console|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Console|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Debug Tiles|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Tiles|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
 		</File>

 		<File

 			RelativePath="..\mt19937ar.h"

@@ -1513,6 +2031,38 @@
 					UsePrecompiledHeader="0"

 				/>

 			</FileConfiguration>

+			<FileConfiguration
+				Name="Debug Console|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Console|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Debug Tiles|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Tiles|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
 		</File>

 		<File

 			RelativePath="..\rltiles\tiledef-dngn.h"

@@ -1553,6 +2103,38 @@
 					UsePrecompiledHeader="0"

 				/>

 			</FileConfiguration>

+			<FileConfiguration
+				Name="Debug Console|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Console|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Debug Tiles|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Tiles|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
 		</File>

 		<File

 			RelativePath="..\rltiles\tiledef-gui.h"

@@ -1593,6 +2175,38 @@
 					UsePrecompiledHeader="0"

 				/>

 			</FileConfiguration>

+			<FileConfiguration
+				Name="Debug Console|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Console|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Debug Tiles|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Tiles|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
 		</File>

 		<File

 			RelativePath="..\rltiles\tiledef-main.h"

@@ -1633,6 +2247,38 @@
 					UsePrecompiledHeader="0"

 				/>

 			</FileConfiguration>

+			<FileConfiguration
+				Name="Debug Console|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Console|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Debug Tiles|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Tiles|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
 		</File>

 		<File

 			RelativePath="..\rltiles\tiledef-player.h"

@@ -1673,6 +2319,38 @@
 					UsePrecompiledHeader="0"

 				/>

 			</FileConfiguration>

+			<FileConfiguration
+				Name="Debug Console|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Console|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Debug Tiles|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Tiles|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
 		</File>

 		<File

 			RelativePath="..\rltiles\tiledef-unrand.h"

diff --git a/crawl-ref/source/MSVC/tilegen.vcproj b/crawl-ref/source/MSVC/tilegen.vcproj
index aec998c047..5e0c753397 100644
--- a/crawl-ref/source/MSVC/tilegen.vcproj
+++ b/crawl-ref/source/MSVC/tilegen.vcproj
@@ -11,6 +11,9 @@
 		<Platform

 			Name="Win32"

 		/>

+		<Platform
+			Name="x64"
+		/>
 	</Platforms>

 	<ToolFiles>

 	</ToolFiles>

@@ -60,7 +63,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="SDL.lib SDL_image.lib libpng.lib"
 				LinkIncremental="2"

-				AdditionalLibraryDirectories="$(ProjectDir)\..\contrib\bin\8.0"
+				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"

 				SubSystem="1"

 				TargetMachine="1"

@@ -136,7 +139,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="SDL.lib SDL_image.lib libpng.lib"
 				LinkIncremental="1"

-				AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\contrib\bin\8.0\$(PlatformName)&quot;"
+				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"

 				SubSystem="1"

 				OptimizeReferences="2"

@@ -167,6 +170,163 @@
 			<Tool

 				Name="VCPostBuildEventTool"

 				CommandLine="cd &quot;$(SolutionDir)\..\rltiles&quot;&#x0D;&#x0A;echo Generating main.png...&#x0D;&#x0A;&quot;$(TargetPath)&quot; dc-main.txt&#x0D;&#x0A;echo Generating dngn.png...&#x0D;&#x0A;&quot;$(TargetPath)&quot; dc-dngn.txt&#x0D;&#x0A;echo Generating player.png...&#x0D;&#x0A;&quot;$(TargetPath)&quot; dc-player.txt&#x0D;&#x0A;echo Generating gui.png...&#x0D;&#x0A;&quot;$(TargetPath)&quot; dc-gui.txt&#x0D;&#x0A;copy *.png ..\dat\tiles\&#x0D;&#x0A;"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets=".\Common.vsprops;.\Tiles.vsprops;.\Debug.vsprops"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="$(SolutionDir)\..\contrib\sdl\include;$(SolutionDir)\..\contrib\sdl-image;$(SolutionDir)\..\contrib\libpng;$(SolutionDir)\..\contrib\zlib"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="SDL.lib SDL_image.lib libpng.lib"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories=""
+				GenerateDebugInformation="true"
+				SubSystem="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"
+				CommandLine="cd &quot;$(SolutionDir)\..\rltiles&quot;&#x0D;&#x0A;echo Generating main.png...&#x0D;&#x0A;&quot;$(SolutionDir)\bin\$(ProjectName)\$(ConfigurationName)\$(ProjectName).exe&quot; dc-main.txt&#x0D;&#x0A;echo Generating dngn.png...&#x0D;&#x0A;&quot;$(SolutionDir)\bin\$(ProjectName)\$(ConfigurationName)\$(ProjectName).exe&quot; dc-dngn.txt&#x0D;&#x0A;echo Generating player.png...&#x0D;&#x0A;&quot;$(SolutionDir)\bin\$(ProjectName)\$(ConfigurationName)\$(ProjectName).exe&quot; dc-player.txt&#x0D;&#x0A;echo Generating gui.png...&#x0D;&#x0A;&quot;$(SolutionDir)\bin\$(ProjectName)\$(ConfigurationName)\$(ProjectName).exe&quot; dc-gui.txt&#x0D;&#x0A;copy *.png ..\dat\tiles\&#x0D;&#x0A;"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets=".\Common.vsprops;.\Tiles.vsprops;.\Release.vsprops"
+			CharacterSet="1"
+			WholeProgramOptimization="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="$(SolutionDir)\..\contrib\sdl\include;$(SolutionDir)\..\contrib\sdl-image;$(SolutionDir)\..\contrib\libpng;$(SolutionDir)\..\contrib\zlib"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="SDL.lib SDL_image.lib libpng.lib"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories=""
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="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"
+				CommandLine="cd &quot;$(SolutionDir)\..\rltiles&quot;&#x0D;&#x0A;echo Generating main.png...&#x0D;&#x0A;&quot;$(TargetPath)&quot; dc-main.txt&#x0D;&#x0A;echo Generating dngn.png...&#x0D;&#x0A;&quot;$(TargetPath)&quot; dc-dngn.txt&#x0D;&#x0A;echo Generating player.png...&#x0D;&#x0A;&quot;$(TargetPath)&quot; dc-player.txt&#x0D;&#x0A;echo Generating gui.png...&#x0D;&#x0A;&quot;$(TargetPath)&quot; dc-gui.txt&#x0D;&#x0A;copy *.png ..\dat\tiles\&#x0D;&#x0A;"
 			/>

 		</Configuration>

 	</Configurations>

diff --git a/crawl-ref/source/contrib/Contribs.sln b/crawl-ref/source/contrib/Contribs.sln
index db1ce3b094..aa548dd174 100644
--- a/crawl-ref/source/contrib/Contribs.sln
+++ b/crawl-ref/source/contrib/Contribs.sln
@@ -30,37 +30,30 @@ Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|Win32 = Debug|Win32

 		Debug|x64 = Debug|x64

-		Release_NoSTDIO|Win32 = Release_NoSTDIO|Win32

-		Release_NoSTDIO|x64 = Release_NoSTDIO|x64

 		Release|Win32 = Release|Win32

 		Release|x64 = Release|x64

 	EndGlobalSection

 	GlobalSection(ProjectConfigurationPlatforms) = postSolution

 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|Win32.ActiveCfg = Debug Multithreaded|Win32

 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|Win32.Build.0 = Debug Multithreaded|Win32

-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|x64.ActiveCfg = Debug|Win32

-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release_NoSTDIO|Win32.ActiveCfg = Release Singlethreaded|Win32

-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release_NoSTDIO|Win32.Build.0 = Release Singlethreaded|Win32

-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release_NoSTDIO|x64.ActiveCfg = Release Singlethreaded|Win32

+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|x64.ActiveCfg = Debug Multithreaded|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|x64.Build.0 = Debug Multithreaded|x64
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|Win32.ActiveCfg = Release Multithreaded|Win32

 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|Win32.Build.0 = Release Multithreaded|Win32

-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|x64.ActiveCfg = Release|Win32

+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|x64.ActiveCfg = Release Multithreaded|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|x64.Build.0 = Release Multithreaded|x64
 		{69C22A64-61EF-4206-816C-6D36766652A6}.Debug|Win32.ActiveCfg = LIB ASM Debug|Win32

 		{69C22A64-61EF-4206-816C-6D36766652A6}.Debug|Win32.Build.0 = LIB ASM Debug|Win32

-		{69C22A64-61EF-4206-816C-6D36766652A6}.Debug|x64.ActiveCfg = DLL VB|Win32

-		{69C22A64-61EF-4206-816C-6D36766652A6}.Release_NoSTDIO|Win32.ActiveCfg = LIB ASM Debug|Win32

-		{69C22A64-61EF-4206-816C-6D36766652A6}.Release_NoSTDIO|Win32.Build.0 = LIB ASM Debug|Win32

-		{69C22A64-61EF-4206-816C-6D36766652A6}.Release_NoSTDIO|x64.ActiveCfg = LIB ASM Debug|Win32

+		{69C22A64-61EF-4206-816C-6D36766652A6}.Debug|x64.ActiveCfg = LIB Debug|x64
+		{69C22A64-61EF-4206-816C-6D36766652A6}.Debug|x64.Build.0 = LIB Debug|x64
 		{69C22A64-61EF-4206-816C-6D36766652A6}.Release|Win32.ActiveCfg = LIB ASM Release|Win32

 		{69C22A64-61EF-4206-816C-6D36766652A6}.Release|Win32.Build.0 = LIB ASM Release|Win32

-		{69C22A64-61EF-4206-816C-6D36766652A6}.Release|x64.ActiveCfg = LIB ASM Debug|Win32

+		{69C22A64-61EF-4206-816C-6D36766652A6}.Release|x64.ActiveCfg = LIB Release|x64
+		{69C22A64-61EF-4206-816C-6D36766652A6}.Release|x64.Build.0 = LIB Release|x64
 		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|Win32.ActiveCfg = Debug|Win32

 		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|Win32.Build.0 = Debug|Win32

 		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|x64.ActiveCfg = Debug|x64

 		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|x64.Build.0 = Debug|x64

-		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release_NoSTDIO|Win32.ActiveCfg = Release|x64

-		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release_NoSTDIO|x64.ActiveCfg = Release|x64

-		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release_NoSTDIO|x64.Build.0 = Release|x64

 		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Win32.ActiveCfg = Release|Win32

 		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Win32.Build.0 = Release|Win32

 		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x64.ActiveCfg = Release|x64

@@ -69,59 +62,46 @@ Global
 		{2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Debug|Win32.Build.0 = Debug|Win32

 		{2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Debug|x64.ActiveCfg = Debug|x64

 		{2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Debug|x64.Build.0 = Debug|x64

-		{2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Release_NoSTDIO|Win32.ActiveCfg = Release|x64

-		{2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Release_NoSTDIO|x64.ActiveCfg = Release|x64

-		{2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Release_NoSTDIO|x64.Build.0 = Release|x64

 		{2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Release|Win32.ActiveCfg = Release|Win32

 		{2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Release|Win32.Build.0 = Release|Win32

 		{2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Release|x64.ActiveCfg = Release|x64

 		{2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Release|x64.Build.0 = Release|x64

 		{A61349B6-4099-4688-AA1A-00D91397857D}.Debug|Win32.ActiveCfg = Debug|Win32

 		{A61349B6-4099-4688-AA1A-00D91397857D}.Debug|Win32.Build.0 = Debug|Win32

-		{A61349B6-4099-4688-AA1A-00D91397857D}.Debug|x64.ActiveCfg = Debug|Win32

-		{A61349B6-4099-4688-AA1A-00D91397857D}.Release_NoSTDIO|Win32.ActiveCfg = Release|Win32

-		{A61349B6-4099-4688-AA1A-00D91397857D}.Release_NoSTDIO|Win32.Build.0 = Release|Win32

-		{A61349B6-4099-4688-AA1A-00D91397857D}.Release_NoSTDIO|x64.ActiveCfg = Release|Win32

+		{A61349B6-4099-4688-AA1A-00D91397857D}.Debug|x64.ActiveCfg = Debug|x64
+		{A61349B6-4099-4688-AA1A-00D91397857D}.Debug|x64.Build.0 = Debug|x64
 		{A61349B6-4099-4688-AA1A-00D91397857D}.Release|Win32.ActiveCfg = Release|Win32

 		{A61349B6-4099-4688-AA1A-00D91397857D}.Release|Win32.Build.0 = Release|Win32

-		{A61349B6-4099-4688-AA1A-00D91397857D}.Release|x64.ActiveCfg = Release|Win32

+		{A61349B6-4099-4688-AA1A-00D91397857D}.Release|x64.ActiveCfg = Release|x64
+		{A61349B6-4099-4688-AA1A-00D91397857D}.Release|x64.Build.0 = Release|x64
 		{5783572B-479A-4EE8-8F16-1FDB24DDD1A0}.Debug|Win32.ActiveCfg = Debug|Win32

 		{5783572B-479A-4EE8-8F16-1FDB24DDD1A0}.Debug|Win32.Build.0 = Debug|Win32

-		{5783572B-479A-4EE8-8F16-1FDB24DDD1A0}.Debug|x64.ActiveCfg = Debug|Win32

-		{5783572B-479A-4EE8-8F16-1FDB24DDD1A0}.Release_NoSTDIO|Win32.ActiveCfg = Release|Win32

-		{5783572B-479A-4EE8-8F16-1FDB24DDD1A0}.Release_NoSTDIO|Win32.Build.0 = Release|Win32

-		{5783572B-479A-4EE8-8F16-1FDB24DDD1A0}.Release_NoSTDIO|x64.ActiveCfg = Release|Win32

+		{5783572B-479A-4EE8-8F16-1FDB24DDD1A0}.Debug|x64.ActiveCfg = Debug|x64
+		{5783572B-479A-4EE8-8F16-1FDB24DDD1A0}.Debug|x64.Build.0 = Debug|x64
 		{5783572B-479A-4EE8-8F16-1FDB24DDD1A0}.Release|Win32.ActiveCfg = Release|Win32

 		{5783572B-479A-4EE8-8F16-1FDB24DDD1A0}.Release|Win32.Build.0 = Release|Win32

-		{5783572B-479A-4EE8-8F16-1FDB24DDD1A0}.Release|x64.ActiveCfg = Release|Win32

+		{5783572B-479A-4EE8-8F16-1FDB24DDD1A0}.Release|x64.ActiveCfg = Release|x64
+		{5783572B-479A-4EE8-8F16-1FDB24DDD1A0}.Release|x64.Build.0 = Release|x64
 		{A0FDC72E-0BE5-4542-B381-6A482DAC2125}.Debug|Win32.ActiveCfg = Debug|Win32

 		{A0FDC72E-0BE5-4542-B381-6A482DAC2125}.Debug|Win32.Build.0 = Debug|Win32

-		{A0FDC72E-0BE5-4542-B381-6A482DAC2125}.Debug|x64.ActiveCfg = Debug|Win32

-		{A0FDC72E-0BE5-4542-B381-6A482DAC2125}.Release_NoSTDIO|Win32.ActiveCfg = Release|Win32

-		{A0FDC72E-0BE5-4542-B381-6A482DAC2125}.Release_NoSTDIO|Win32.Build.0 = Release|Win32

-		{A0FDC72E-0BE5-4542-B381-6A482DAC2125}.Release_NoSTDIO|x64.ActiveCfg = Release|Win32

+		{A0FDC72E-0BE5-4542-B381-6A482DAC2125}.Debug|x64.ActiveCfg = Debug|x64
+		{A0FDC72E-0BE5-4542-B381-6A482DAC2125}.Debug|x64.Build.0 = Debug|x64
 		{A0FDC72E-0BE5-4542-B381-6A482DAC2125}.Release|Win32.ActiveCfg = Release|Win32

 		{A0FDC72E-0BE5-4542-B381-6A482DAC2125}.Release|Win32.Build.0 = Release|Win32

-		{A0FDC72E-0BE5-4542-B381-6A482DAC2125}.Release|x64.ActiveCfg = Release|Win32

+		{A0FDC72E-0BE5-4542-B381-6A482DAC2125}.Release|x64.ActiveCfg = Release|x64
+		{A0FDC72E-0BE5-4542-B381-6A482DAC2125}.Release|x64.Build.0 = Release|x64
 		{3D9F174B-2909-4834-A3D7-892E8D442A5D}.Debug|Win32.ActiveCfg = LIB ASM Debug|Win32

 		{3D9F174B-2909-4834-A3D7-892E8D442A5D}.Debug|Win32.Build.0 = LIB ASM Debug|Win32

-		{3D9F174B-2909-4834-A3D7-892E8D442A5D}.Debug|x64.ActiveCfg = DLL Debug|x64

-		{3D9F174B-2909-4834-A3D7-892E8D442A5D}.Debug|x64.Build.0 = DLL Debug|x64

-		{3D9F174B-2909-4834-A3D7-892E8D442A5D}.Release_NoSTDIO|Win32.ActiveCfg = LIB ASM Release|x64

-		{3D9F174B-2909-4834-A3D7-892E8D442A5D}.Release_NoSTDIO|x64.ActiveCfg = LIB ASM Release|x64

-		{3D9F174B-2909-4834-A3D7-892E8D442A5D}.Release_NoSTDIO|x64.Build.0 = LIB ASM Release|x64

+		{3D9F174B-2909-4834-A3D7-892E8D442A5D}.Debug|x64.ActiveCfg = LIB Debug|x64
+		{3D9F174B-2909-4834-A3D7-892E8D442A5D}.Debug|x64.Build.0 = LIB Debug|x64
 		{3D9F174B-2909-4834-A3D7-892E8D442A5D}.Release|Win32.ActiveCfg = LIB ASM Release|Win32

 		{3D9F174B-2909-4834-A3D7-892E8D442A5D}.Release|Win32.Build.0 = LIB ASM Release|Win32

-		{3D9F174B-2909-4834-A3D7-892E8D442A5D}.Release|x64.ActiveCfg = LIB ASM Release|x64

-		{3D9F174B-2909-4834-A3D7-892E8D442A5D}.Release|x64.Build.0 = LIB ASM Release|x64

+		{3D9F174B-2909-4834-A3D7-892E8D442A5D}.Release|x64.ActiveCfg = LIB Release|x64
+		{3D9F174B-2909-4834-A3D7-892E8D442A5D}.Release|x64.Build.0 = LIB Release|x64
 		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|Win32.ActiveCfg = Debug|Win32

 		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|Win32.Build.0 = Debug|Win32

 		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|x64.ActiveCfg = Debug|x64

 		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|x64.Build.0 = Debug|x64

-		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release_NoSTDIO|Win32.ActiveCfg = Release_NoSTDIO|Win32

-		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release_NoSTDIO|Win32.Build.0 = Release_NoSTDIO|Win32

-		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release_NoSTDIO|x64.ActiveCfg = Release_NoSTDIO|x64

-		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release_NoSTDIO|x64.Build.0 = Release_NoSTDIO|x64

 		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|Win32.ActiveCfg = Release|Win32

 		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|Win32.Build.0 = Release|Win32

 		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|x64.ActiveCfg = Release|x64

diff --git a/crawl-ref/source/contrib/freetype b/crawl-ref/source/contrib/freetype
-Subproject 3d6a14520699a44a1d5c38490ffa9e3277aac24
+Subproject 94b26257462f63065dce6b3248958e800d9e894
diff --git a/crawl-ref/source/contrib/libpng b/crawl-ref/source/contrib/libpng
-Subproject d2547b434bd09ea819abed50934b465f120274e
+Subproject 1a5f7d3be987aa8b8d35b554f143f76e6429958
diff --git a/crawl-ref/source/contrib/lua b/crawl-ref/source/contrib/lua
-Subproject f641f8271c77ff5ad311d0f536accdc571d9b32
+Subproject 9540ee4655ff723d7dd88d476725dff2d7ad0b4
diff --git a/crawl-ref/source/contrib/pcre b/crawl-ref/source/contrib/pcre
-Subproject 8e797e6e88e85e72bb9a030f3f46cd7aba544ff
+Subproject 0ac94b7dbb2835a3cf668799e56247e3fcc500f
diff --git a/crawl-ref/source/contrib/sdl b/crawl-ref/source/contrib/sdl
-Subproject b59d2431e42bb1fd124f1c3709b73704927f862
+Subproject a99f392911f097a76e2b73277ae22857314a05d
diff --git a/crawl-ref/source/contrib/sdl-image b/crawl-ref/source/contrib/sdl-image
-Subproject d8ee43c7258bde2a76d54366939932e4cb42d88
+Subproject 0fcc067578c37ac5f42675bfa1240d7e116f3aa
diff --git a/crawl-ref/source/contrib/sqlite b/crawl-ref/source/contrib/sqlite
-Subproject a339a5fb229898d821c618a994046cf67e6a6b4
+Subproject 035e853bef3cf55f509f9212dc0bdf61ba643ea