Merge branch 'master' into gargoyle_merge

Conflicts resolved:
	crawl-ref/source/enum.h
	crawl-ref/source/ng-restr.cc
	crawl-ref/source/player.cc
	crawl-ref/source/species.cc
	crawl-ref/source/tag-version.h

8 files changed, 286 insertions, 46 deletions

diff --git a/crawl-ref/source/contrib/.gitignore b/crawl-ref/source/contrib/.gitignore
index d6fb5fa154..76d25ec565 100644
--- a/crawl-ref/source/contrib/.gitignore
+++ b/crawl-ref/source/contrib/.gitignore
@@ -7,3 +7,8 @@
 
 # Locally built contribs
 /install
+
+# MSVC temp files
+*.sdf
+*.opensdf
+*.suo
diff --git a/crawl-ref/source/contrib/Common.props b/crawl-ref/source/contrib/Common.props
new file mode 100644
index 0000000000..46320ac524
--- /dev/null
+++ b/crawl-ref/source/contrib/Common.props
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>11.0.60315.1</_ProjectFileVersion>
+    <OutDir>$(SolutionDir)\bin\8.0\$(PlatformName)\</OutDir>
+    <IntDir>$(SolutionDir)\obj\$(ProjectName)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>C:\SDKs\DirectX\Include;C:\SDKs\Windows\v6.1\Include;C:\SDKs\OpenAL\include;C:\SDKs\OpenGL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <MinimalRebuild>true</MinimalRebuild>
+      <ExceptionHandling />
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <ProgramDataBaseFileName>$(TargetDir)$(TargetName).pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>../../contrib/bin/8.0/$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup />
+</Project>
diff --git a/crawl-ref/source/contrib/Contribs-vs2010.sln b/crawl-ref/source/contrib/Contribs-vs2010.sln
new file mode 100644
index 0000000000..1fd5d64e75
--- /dev/null
+++ b/crawl-ref/source/contrib/Contribs-vs2010.sln
@@ -0,0 +1,141 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype-vs2010", "freetype\builds\win32\vc2010\freetype.vcxproj", "{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng-vs2010", "libpng\projects\visualc10\libpng.vcxproj", "{69C22A64-61EF-4206-816C-6D36766652A6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL-vs2010", "sdl\VisualC\SDL\SDL-vs2010.vcxproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL_image-vs2010", "sdl-image\VisualC\SDL_image-vs2010.vcxproj", "{2BD5534E-00E2-4BEA-AC96-D9A92EA24696}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua-vs2010", "lua\src\lua-vs2010.vcxproj", "{A61349B6-4099-4688-AA1A-00D91397857D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite-vs2010", "sqlite\sqlite-vs2010.vcxproj", "{5783572B-479A-4EE8-8F16-1FDB24DDD1A0}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcre-vs2010", "pcre\pcre-vs2010.vcxproj", "{A0FDC72E-0BE5-4542-B381-6A482DAC2125}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib-vs2010", "zlib\projects\visualc2010\zlib.vcxproj", "{3D9F174B-2909-4834-A3D7-892E8D442A5D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain-vs2010", "sdl\VisualC\SDLmain\SDLmain-vs2010.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release LTCG|Win32 = Release LTCG|Win32
+		Release LTCG|x64 = Release LTCG|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 LTCG|Win32.ActiveCfg = Release LTCG|Win32
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release LTCG|Win32.Build.0 = Release LTCG|Win32
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release LTCG|x64.ActiveCfg = Release LTCG|Win32
+		{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
+		{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 = LIB Debug|x64
+		{69C22A64-61EF-4206-816C-6D36766652A6}.Debug|x64.Build.0 = LIB Debug|x64
+		{69C22A64-61EF-4206-816C-6D36766652A6}.Release LTCG|Win32.ActiveCfg = Release LTCG|Win32
+		{69C22A64-61EF-4206-816C-6D36766652A6}.Release LTCG|Win32.Build.0 = Release LTCG|Win32
+		{69C22A64-61EF-4206-816C-6D36766652A6}.Release LTCG|x64.ActiveCfg = Release LTCG|x64
+		{69C22A64-61EF-4206-816C-6D36766652A6}.Release LTCG|x64.Build.0 = Release LTCG|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 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 LTCG|Win32.ActiveCfg = Release LTCG|Win32
+		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release LTCG|Win32.Build.0 = Release LTCG|Win32
+		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release LTCG|x64.ActiveCfg = Release LTCG|x64
+		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release LTCG|x64.Build.0 = Release LTCG|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
+		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x64.Build.0 = Release|x64
+		{2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Debug|Win32.ActiveCfg = Debug|Win32
+		{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 LTCG|Win32.ActiveCfg = Release LTCG|Win32
+		{2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Release LTCG|Win32.Build.0 = Release LTCG|Win32
+		{2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Release LTCG|x64.ActiveCfg = Release LTCG|x64
+		{2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Release LTCG|x64.Build.0 = Release LTCG|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|x64
+		{A61349B6-4099-4688-AA1A-00D91397857D}.Debug|x64.Build.0 = Debug|x64
+		{A61349B6-4099-4688-AA1A-00D91397857D}.Release LTCG|Win32.ActiveCfg = Release LTCG|Win32
+		{A61349B6-4099-4688-AA1A-00D91397857D}.Release LTCG|Win32.Build.0 = Release LTCG|Win32
+		{A61349B6-4099-4688-AA1A-00D91397857D}.Release LTCG|x64.ActiveCfg = Release LTCG|x64
+		{A61349B6-4099-4688-AA1A-00D91397857D}.Release LTCG|x64.Build.0 = Release LTCG|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|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|x64
+		{5783572B-479A-4EE8-8F16-1FDB24DDD1A0}.Debug|x64.Build.0 = Debug|x64
+		{5783572B-479A-4EE8-8F16-1FDB24DDD1A0}.Release LTCG|Win32.ActiveCfg = Release LTCG|Win32
+		{5783572B-479A-4EE8-8F16-1FDB24DDD1A0}.Release LTCG|Win32.Build.0 = Release LTCG|Win32
+		{5783572B-479A-4EE8-8F16-1FDB24DDD1A0}.Release LTCG|x64.ActiveCfg = Release LTCG|x64
+		{5783572B-479A-4EE8-8F16-1FDB24DDD1A0}.Release LTCG|x64.Build.0 = Release LTCG|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|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|x64
+		{A0FDC72E-0BE5-4542-B381-6A482DAC2125}.Debug|x64.Build.0 = Debug|x64
+		{A0FDC72E-0BE5-4542-B381-6A482DAC2125}.Release LTCG|Win32.ActiveCfg = Release LTCG|Win32
+		{A0FDC72E-0BE5-4542-B381-6A482DAC2125}.Release LTCG|Win32.Build.0 = Release LTCG|Win32
+		{A0FDC72E-0BE5-4542-B381-6A482DAC2125}.Release LTCG|x64.ActiveCfg = Release LTCG|x64
+		{A0FDC72E-0BE5-4542-B381-6A482DAC2125}.Release LTCG|x64.Build.0 = Release LTCG|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|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 = LIB Debug|x64
+		{3D9F174B-2909-4834-A3D7-892E8D442A5D}.Debug|x64.Build.0 = LIB Debug|x64
+		{3D9F174B-2909-4834-A3D7-892E8D442A5D}.Release LTCG|Win32.ActiveCfg = Release LTCG|Win32
+		{3D9F174B-2909-4834-A3D7-892E8D442A5D}.Release LTCG|Win32.Build.0 = Release LTCG|Win32
+		{3D9F174B-2909-4834-A3D7-892E8D442A5D}.Release LTCG|x64.ActiveCfg = Release LTCG|x64
+		{3D9F174B-2909-4834-A3D7-892E8D442A5D}.Release LTCG|x64.Build.0 = Release LTCG|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 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 LTCG|Win32.ActiveCfg = Release LTCG|Win32
+		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release LTCG|Win32.Build.0 = Release LTCG|Win32
+		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release LTCG|x64.ActiveCfg = Release LTCG|x64
+		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release LTCG|x64.Build.0 = Release LTCG|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
+		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/crawl-ref/source/contrib/Contribs.sln b/crawl-ref/source/contrib/Contribs.sln
index aa548dd174..c5999b61d3 100644
--- a/crawl-ref/source/contrib/Contribs.sln
+++ b/crawl-ref/source/contrib/Contribs.sln
@@ -1,30 +1,23 @@
 

-Microsoft Visual Studio Solution File, Format Version 9.00

-# Visual Studio 2005

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype", "freetype\builds\win32\vc2005\freetype.vcproj", "{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}"

+Microsoft Visual Studio Solution File, Format Version 12.00

+# Visual Studio Express 2012 for Windows Desktop

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype", "freetype\builds\win32\vc2012\freetype.vcxproj", "{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "libpng\projects\visualc8\libpng.vcproj", "{69C22A64-61EF-4206-816C-6D36766652A6}"

-	ProjectSection(ProjectDependencies) = postProject

-		{3D9F174B-2909-4834-A3D7-892E8D442A5D} = {3D9F174B-2909-4834-A3D7-892E8D442A5D}

-	EndProjectSection

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "libpng\projects\visualc11\libpng.vcxproj", "{69C22A64-61EF-4206-816C-6D36766652A6}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "sdl\VisualC\SDL\SDL.vcproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "sdl\VisualC\SDL\SDL.vcxproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL_image", "sdl-image\VisualC\SDL_image.vcproj", "{2BD5534E-00E2-4BEA-AC96-D9A92EA24696}"

-	ProjectSection(ProjectDependencies) = postProject

-		{69C22A64-61EF-4206-816C-6D36766652A6} = {69C22A64-61EF-4206-816C-6D36766652A6}

-		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}

-	EndProjectSection

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL_image", "sdl-image\VisualC\SDL_image.vcxproj", "{2BD5534E-00E2-4BEA-AC96-D9A92EA24696}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua", "lua\src\lua.vcproj", "{A61349B6-4099-4688-AA1A-00D91397857D}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua", "lua\src\lua.vcxproj", "{A61349B6-4099-4688-AA1A-00D91397857D}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite", "sqlite\sqlite.vcproj", "{5783572B-479A-4EE8-8F16-1FDB24DDD1A0}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite", "sqlite\sqlite.vcxproj", "{5783572B-479A-4EE8-8F16-1FDB24DDD1A0}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcre", "pcre\pcre.vcproj", "{A0FDC72E-0BE5-4542-B381-6A482DAC2125}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcre", "pcre\pcre.vcxproj", "{A0FDC72E-0BE5-4542-B381-6A482DAC2125}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "zlib\projects\visualc2005\zlib.vcproj", "{3D9F174B-2909-4834-A3D7-892E8D442A5D}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "zlib\projects\visualc2012\zlib.vcxproj", "{3D9F174B-2909-4834-A3D7-892E8D442A5D}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "sdl\VisualC\SDLmain\SDLmain.vcproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "sdl\VisualC\SDLmain\SDLmain.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"

 EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

@@ -36,20 +29,18 @@ Global
 	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 Multithreaded|x64
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|x64.Build.0 = Debug Multithreaded|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|x64.ActiveCfg = Debug Multithreaded|Win32

 		{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 Multithreaded|x64
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|x64.Build.0 = Release Multithreaded|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|x64.ActiveCfg = Release Multithreaded|Win32

 		{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 = LIB Debug|x64
-		{69C22A64-61EF-4206-816C-6D36766652A6}.Debug|x64.Build.0 = LIB Debug|x64
+		{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 Release|x64
-		{69C22A64-61EF-4206-816C-6D36766652A6}.Release|x64.Build.0 = LIB Release|x64
+		{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

@@ -68,36 +59,36 @@ Global
 		{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|x64
-		{A61349B6-4099-4688-AA1A-00D91397857D}.Debug|x64.Build.0 = Debug|x64
+		{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|x64
-		{A61349B6-4099-4688-AA1A-00D91397857D}.Release|x64.Build.0 = Release|x64
+		{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|x64
-		{5783572B-479A-4EE8-8F16-1FDB24DDD1A0}.Debug|x64.Build.0 = Debug|x64
+		{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|x64
-		{5783572B-479A-4EE8-8F16-1FDB24DDD1A0}.Release|x64.Build.0 = Release|x64
+		{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|x64
-		{A0FDC72E-0BE5-4542-B381-6A482DAC2125}.Debug|x64.Build.0 = Debug|x64
+		{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|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 = 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 Release|x64
-		{3D9F174B-2909-4834-A3D7-892E8D442A5D}.Release|x64.Build.0 = LIB Release|x64
+		{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 Debug|Win32

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

+		{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 Release|Win32

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

+		{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

diff --git a/crawl-ref/source/contrib/DLL.props b/crawl-ref/source/contrib/DLL.props
new file mode 100644
index 0000000000..e57eec8ed8
--- /dev/null
+++ b/crawl-ref/source/contrib/DLL.props
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>11.0.60315.1</_ProjectFileVersion>
+    <_PropertySheetDisplayName>Dynamic Link Library</_PropertySheetDisplayName>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>__DYNAMIC__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(SolutionDir)\..\$(ProjectName).dll</OutputFile>
+      <ImportLibrary>$(SolutionDir)\bin\8.0\$(Platform)\$(ProjectName).lib</ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup />
+</Project>
diff --git a/crawl-ref/source/contrib/Debug.props b/crawl-ref/source/contrib/Debug.props
new file mode 100644
index 0000000000..bed2dbba2f
--- /dev/null
+++ b/crawl-ref/source/contrib/Debug.props
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>11.0.60315.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup />
+</Project>
diff --git a/crawl-ref/source/contrib/LIB.props b/crawl-ref/source/contrib/LIB.props
new file mode 100644
index 0000000000..de9d8b7605
--- /dev/null
+++ b/crawl-ref/source/contrib/LIB.props
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>11.0.60315.1</_ProjectFileVersion>
+    <_PropertySheetDisplayName>Static Library</_PropertySheetDisplayName>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>__STATIC__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup />
+</Project>
diff --git a/crawl-ref/source/contrib/Release.props b/crawl-ref/source/contrib/Release.props
new file mode 100644
index 0000000000..7a6a27fdc8
--- /dev/null
+++ b/crawl-ref/source/contrib/Release.props
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>11.0.60315.1</_ProjectFileVersion>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup />
+</Project>