From 59d9acac0b803124032d42df4b7a5d03021ab16e Mon Sep 17 00:00:00 2001
From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sun, 9 Aug 2015 18:30:47 +0000
Subject: [PATCH] Fixed two compile issues with vid_sdl.c.

Added support for SDL2 compilation in vs2010, vs2012, vs2013.

Changed the build directories for all vs2010, vs2012, vs2013 projects - they are now more consistent (output binaries go into SolutionDir, intermediate files have a fully qualified directory so they don't conflict between builds).

Audited and reduced differences between vs2010, vs2012, vs2013 projects.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12224 d7cf8633-e32d-0410-b094-e92efae38249
---
 darkplaces-dedicated-vs2010.vcxproj |  12 +-
 darkplaces-dedicated-vs2012.vcxproj |  22 +-
 darkplaces-dedicated-vs2013.vcxproj |  22 +-
 darkplaces-sdl-vs2010.vcxproj       |   8 +-
 darkplaces-sdl-vs2012.vcxproj       |  14 +-
 darkplaces-sdl-vs2013.vcxproj       |  14 +-
 darkplaces-sdl2-vs2010.vcxproj      | 292 +++++++++++++++++++++
 darkplaces-sdl2-vs2012.vcxproj      | 383 +++++++++++++++++++++++++++
 darkplaces-sdl2-vs2013.vcxproj      | 392 ++++++++++++++++++++++++++++
 darkplaces-vs2010.sln               |   8 +-
 darkplaces-vs2012.sln               |   8 +-
 darkplaces-vs2013.sln               |  20 +-
 darkplaces-wgl-vs2010.vcxproj       |  10 +-
 darkplaces-wgl-vs2012.vcxproj       |  14 +-
 darkplaces-wgl-vs2013.vcxproj       |  14 +-
 sys_sdl.c                           |  16 +-
 vid_sdl.c                           |   5 +-
 vs2010_sdl2_win32.props             |  14 +
 vs2010_sdl2_win64.props             |  14 +
 vs2012_sdl2_win32.props             |  14 +
 vs2012_sdl2_win64.props             |  14 +
 21 files changed, 1228 insertions(+), 82 deletions(-)
 create mode 100644 darkplaces-sdl2-vs2010.vcxproj
 create mode 100644 darkplaces-sdl2-vs2012.vcxproj
 create mode 100644 darkplaces-sdl2-vs2013.vcxproj
 create mode 100644 vs2010_sdl2_win32.props
 create mode 100644 vs2010_sdl2_win64.props
 create mode 100644 vs2012_sdl2_win32.props
 create mode 100644 vs2012_sdl2_win64.props

diff --git a/darkplaces-dedicated-vs2010.vcxproj b/darkplaces-dedicated-vs2010.vcxproj
index 2d601db7..92b37c95 100644
--- a/darkplaces-dedicated-vs2010.vcxproj
+++ b/darkplaces-dedicated-vs2010.vcxproj
@@ -39,11 +39,11 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)-$(ProjectName)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)-$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)-$(ProjectName)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)-$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)</TargetName>
@@ -57,7 +57,7 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
@@ -77,7 +77,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
diff --git a/darkplaces-dedicated-vs2012.vcxproj b/darkplaces-dedicated-vs2012.vcxproj
index 7d8f85f2..0f17ffef 100644
--- a/darkplaces-dedicated-vs2012.vcxproj
+++ b/darkplaces-dedicated-vs2012.vcxproj
@@ -71,23 +71,23 @@
     <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)$(Configuration)-$(ProjectName)\</OutDir>
-    <IntDir>$(Configuration)-$(ProjectName)-DED\</IntDir>
+    <OutDir>$(SolutionDir))\</OutDir>
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)-DED\</IntDir>
+    <OutDir>$(SolutionDir)\</OutDir>
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>$(SolutionDir)\</OutDir>
-    <IntDir>$(Configuration)-$(ProjectName)-DED\</IntDir>
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)-DED\</IntDir>
+    <OutDir>$(SolutionDir)\</OutDir>
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -98,7 +98,7 @@
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -121,7 +121,7 @@
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -141,7 +141,7 @@
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -166,7 +166,7 @@
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
diff --git a/darkplaces-dedicated-vs2013.vcxproj b/darkplaces-dedicated-vs2013.vcxproj
index ff19a776..4a85b170 100644
--- a/darkplaces-dedicated-vs2013.vcxproj
+++ b/darkplaces-dedicated-vs2013.vcxproj
@@ -71,23 +71,23 @@
     <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)$(Configuration)-$(ProjectName)\</OutDir>
-    <IntDir>$(Configuration)-$(ProjectName)-DED\</IntDir>
+    <OutDir>$(SolutionDir))\</OutDir>
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)-DED\</IntDir>
+    <OutDir>$(SolutionDir)\</OutDir>
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>$(SolutionDir)\</OutDir>
-    <IntDir>$(Configuration)-$(ProjectName)-DED\</IntDir>
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)-DED\</IntDir>
+    <OutDir>$(SolutionDir)\</OutDir>
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -98,7 +98,7 @@
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -122,7 +122,7 @@
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -143,7 +143,7 @@
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -169,7 +169,7 @@
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
diff --git a/darkplaces-sdl-vs2010.vcxproj b/darkplaces-sdl-vs2010.vcxproj
index 912237b0..4d93ef33 100644
--- a/darkplaces-sdl-vs2010.vcxproj
+++ b/darkplaces-sdl-vs2010.vcxproj
@@ -39,11 +39,11 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)-$(ProjectName)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)-$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)-$(ProjectName)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)-$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)</TargetName>
diff --git a/darkplaces-sdl-vs2012.vcxproj b/darkplaces-sdl-vs2012.vcxproj
index 0e182318..551ed83d 100644
--- a/darkplaces-sdl-vs2012.vcxproj
+++ b/darkplaces-sdl-vs2012.vcxproj
@@ -71,23 +71,23 @@
     <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)$(Configuration)-$(ProjectName)\</OutDir>
-    <IntDir>$(Configuration)-$(ProjectName)-SDL\</IntDir>
+    <OutDir>$(SolutionDir))\</OutDir>
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)-SDL\</IntDir>
+    <OutDir>$(SolutionDir)\</OutDir>
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>$(SolutionDir)\</OutDir>
-    <IntDir>$(Configuration)-$(ProjectName)-SDL\</IntDir>
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)-SDL\</IntDir>
+    <OutDir>$(SolutionDir)\</OutDir>
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/darkplaces-sdl-vs2013.vcxproj b/darkplaces-sdl-vs2013.vcxproj
index c7ddf274..0f883390 100644
--- a/darkplaces-sdl-vs2013.vcxproj
+++ b/darkplaces-sdl-vs2013.vcxproj
@@ -71,23 +71,23 @@
     <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)$(Configuration)-$(ProjectName)\</OutDir>
-    <IntDir>$(Configuration)-$(ProjectName)-SDL\</IntDir>
+    <OutDir>$(SolutionDir))\</OutDir>
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)-SDL\</IntDir>
+    <OutDir>$(SolutionDir)\</OutDir>
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>$(SolutionDir)\</OutDir>
-    <IntDir>$(Configuration)-$(ProjectName)-SDL\</IntDir>
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)-SDL\</IntDir>
+    <OutDir>$(SolutionDir)\</OutDir>
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/darkplaces-sdl2-vs2010.vcxproj b/darkplaces-sdl2-vs2010.vcxproj
new file mode 100644
index 00000000..9401d143
--- /dev/null
+++ b/darkplaces-sdl2-vs2010.vcxproj
@@ -0,0 +1,292 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}</ProjectGuid>
+    <RootNamespace>darkplacessdl2</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="vs2010_sdl2_win32.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="vs2010_sdl2_win32.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>CONFIG_MENU;CONFIG_CD;WIN32;_DEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <IgnoreSpecificDefaultLibraries>msvcrt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>CONFIG_MENU;CONFIG_CD;WIN32;NDEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="bih.c" />
+    <ClCompile Include="builddate.c" />
+    <ClCompile Include="cap_avi.c" />
+    <ClCompile Include="cap_ogg.c" />
+    <ClCompile Include="cd_sdl.c" />
+    <ClCompile Include="cd_shared.c" />
+    <ClCompile Include="cl_collision.c" />
+    <ClCompile Include="cl_demo.c" />
+    <ClCompile Include="cl_dyntexture.c" />
+    <ClCompile Include="cl_input.c" />
+    <ClCompile Include="cl_main.c" />
+    <ClCompile Include="cl_parse.c" />
+    <ClCompile Include="cl_particles.c" />
+    <ClCompile Include="cl_screen.c" />
+    <ClCompile Include="cl_video.c" />
+    <ClCompile Include="clvm_cmds.c" />
+    <ClCompile Include="cmd.c" />
+    <ClCompile Include="collision.c" />
+    <ClCompile Include="common.c" />
+    <ClCompile Include="console.c" />
+    <ClCompile Include="crypto.c" />
+    <ClCompile Include="csprogs.c" />
+    <ClCompile Include="curves.c" />
+    <ClCompile Include="cvar.c" />
+    <ClCompile Include="dpsoftrast.c" />
+    <ClCompile Include="dpvsimpledecode.c" />
+    <ClCompile Include="filematch.c" />
+    <ClCompile Include="fractalnoise.c" />
+    <ClCompile Include="fs.c" />
+    <ClCompile Include="ft2.c" />
+    <ClCompile Include="gl_backend.c" />
+    <ClCompile Include="gl_draw.c" />
+    <ClCompile Include="gl_rmain.c" />
+    <ClCompile Include="gl_rsurf.c" />
+    <ClCompile Include="gl_textures.c" />
+    <ClCompile Include="hmac.c" />
+    <ClCompile Include="host.c" />
+    <ClCompile Include="host_cmd.c" />
+    <ClCompile Include="image.c" />
+    <ClCompile Include="image_png.c" />
+    <ClCompile Include="jpeg.c" />
+    <ClCompile Include="keys.c" />
+    <ClCompile Include="lhnet.c" />
+    <ClCompile Include="libcurl.c" />
+    <ClCompile Include="mathlib.c" />
+    <ClCompile Include="matrixlib.c" />
+    <ClCompile Include="mdfour.c" />
+    <ClCompile Include="menu.c" />
+    <ClCompile Include="meshqueue.c" />
+    <ClCompile Include="mod_skeletal_animatevertices_generic.c" />
+    <ClCompile Include="mod_skeletal_animatevertices_sse.c" />
+    <ClCompile Include="model_alias.c" />
+    <ClCompile Include="model_brush.c" />
+    <ClCompile Include="model_shared.c" />
+    <ClCompile Include="model_sprite.c" />
+    <ClCompile Include="mvm_cmds.c" />
+    <ClCompile Include="netconn.c" />
+    <ClCompile Include="palette.c" />
+    <ClCompile Include="polygon.c" />
+    <ClCompile Include="portals.c" />
+    <ClCompile Include="protocol.c" />
+    <ClCompile Include="prvm_cmds.c" />
+    <ClCompile Include="prvm_edict.c" />
+    <ClCompile Include="prvm_exec.c" />
+    <ClCompile Include="r_explosion.c" />
+    <ClCompile Include="r_lightning.c" />
+    <ClCompile Include="r_modules.c" />
+    <ClCompile Include="r_shadow.c" />
+    <ClCompile Include="r_sky.c" />
+    <ClCompile Include="r_sprites.c" />
+    <ClCompile Include="sbar.c" />
+    <ClCompile Include="snd_main.c" />
+    <ClCompile Include="snd_mem.c" />
+    <ClCompile Include="snd_mix.c" />
+    <ClCompile Include="snd_ogg.c" />
+    <ClCompile Include="snd_sdl.c" />
+    <ClCompile Include="snd_wav.c" />
+    <ClCompile Include="sv_demo.c" />
+    <ClCompile Include="sv_main.c" />
+    <ClCompile Include="sv_move.c" />
+    <ClCompile Include="sv_phys.c" />
+    <ClCompile Include="sv_user.c" />
+    <ClCompile Include="svbsp.c" />
+    <ClCompile Include="svvm_cmds.c" />
+    <ClCompile Include="sys_sdl.c" />
+    <ClCompile Include="sys_shared.c" />
+    <ClCompile Include="thread_sdl.c" />
+    <ClCompile Include="utf8lib.c" />
+    <ClCompile Include="vid_sdl.c" />
+    <ClCompile Include="vid_shared.c" />
+    <ClCompile Include="view.c" />
+    <ClCompile Include="wad.c" />
+    <ClCompile Include="world.c" />
+    <ClCompile Include="zone.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="bih.h" />
+    <ClInclude Include="bspfile.h" />
+    <ClInclude Include="cap_avi.h" />
+    <ClInclude Include="cap_ogg.h" />
+    <ClInclude Include="cdaudio.h" />
+    <ClInclude Include="cl_collision.h" />
+    <ClInclude Include="cl_dyntexture.h" />
+    <ClInclude Include="cl_gecko.h" />
+    <ClInclude Include="cl_screen.h" />
+    <ClInclude Include="cl_video.h" />
+    <ClInclude Include="client.h" />
+    <ClInclude Include="clprogdefs.h" />
+    <ClInclude Include="clvm_cmds.h" />
+    <ClInclude Include="cmd.h" />
+    <ClInclude Include="collision.h" />
+    <ClInclude Include="common.h" />
+    <ClInclude Include="console.h" />
+    <ClInclude Include="crypto.h" />
+    <ClInclude Include="csprogs.h" />
+    <ClInclude Include="curves.h" />
+    <ClInclude Include="cvar.h" />
+    <ClInclude Include="dpsoftrast.h" />
+    <ClInclude Include="dpvsimpledecode.h" />
+    <ClInclude Include="draw.h" />
+    <ClInclude Include="fs.h" />
+    <ClInclude Include="ft2.h" />
+    <ClInclude Include="ft2_defs.h" />
+    <ClInclude Include="ft2_fontdefs.h" />
+    <ClInclude Include="gl_backend.h" />
+    <ClInclude Include="glquake.h" />
+    <ClInclude Include="hmac.h" />
+    <ClInclude Include="image.h" />
+    <ClInclude Include="image_png.h" />
+    <ClInclude Include="input.h" />
+    <ClInclude Include="intoverflow.h" />
+    <ClInclude Include="jpeg.h" />
+    <ClInclude Include="keys.h" />
+    <ClInclude Include="lhfont.h" />
+    <ClInclude Include="lhnet.h" />
+    <ClInclude Include="libcurl.h" />
+    <ClInclude Include="mathlib.h" />
+    <ClInclude Include="matrixlib.h" />
+    <ClInclude Include="mdfour.h" />
+    <ClInclude Include="menu.h" />
+    <ClInclude Include="meshqueue.h" />
+    <ClInclude Include="mod_skeletal_animatevertices_generic.h" />
+    <ClInclude Include="mod_skeletal_animatevertices_sse.h" />
+    <ClInclude Include="model_alias.h" />
+    <ClInclude Include="model_brush.h" />
+    <ClInclude Include="model_dpmodel.h" />
+    <ClInclude Include="model_iqm.h" />
+    <ClInclude Include="model_psk.h" />
+    <ClInclude Include="model_shared.h" />
+    <ClInclude Include="model_sprite.h" />
+    <ClInclude Include="model_zymotic.h" />
+    <ClInclude Include="modelgen.h" />
+    <ClInclude Include="mprogdefs.h" />
+    <ClInclude Include="netconn.h" />
+    <ClInclude Include="palette.h" />
+    <ClInclude Include="polygon.h" />
+    <ClInclude Include="portals.h" />
+    <ClInclude Include="pr_comp.h" />
+    <ClInclude Include="progdefs.h" />
+    <ClInclude Include="progs.h" />
+    <ClInclude Include="progsvm.h" />
+    <ClInclude Include="protocol.h" />
+    <ClInclude Include="prvm_cmds.h" />
+    <ClInclude Include="prvm_execprogram.h" />
+    <ClInclude Include="qtypes.h" />
+    <ClInclude Include="quakedef.h" />
+    <ClInclude Include="r_lerpanim.h" />
+    <ClInclude Include="r_modules.h" />
+    <ClInclude Include="r_shadow.h" />
+    <ClInclude Include="r_textures.h" />
+    <ClInclude Include="render.h" />
+    <ClInclude Include="resource.h" />
+    <ClInclude Include="sbar.h" />
+    <ClInclude Include="screen.h" />
+    <ClInclude Include="SDLMain.h" />
+    <ClInclude Include="server.h" />
+    <ClInclude Include="shader_glsl.h" />
+    <ClInclude Include="shader_hlsl.h" />
+    <ClInclude Include="snd_main.h" />
+    <ClInclude Include="snd_ogg.h" />
+    <ClInclude Include="snd_wav.h" />
+    <ClInclude Include="sound.h" />
+    <ClInclude Include="spritegn.h" />
+    <ClInclude Include="sv_demo.h" />
+    <ClInclude Include="svbsp.h" />
+    <ClInclude Include="sys.h" />
+    <ClInclude Include="thread.h" />
+    <ClInclude Include="timing.h" />
+    <ClInclude Include="utf8lib.h" />
+    <ClInclude Include="vid.h" />
+    <ClInclude Include="wad.h" />
+    <ClInclude Include="world.h" />
+    <ClInclude Include="zone.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/darkplaces-sdl2-vs2012.vcxproj b/darkplaces-sdl2-vs2012.vcxproj
new file mode 100644
index 00000000..9a49ba37
--- /dev/null
+++ b/darkplaces-sdl2-vs2012.vcxproj
@@ -0,0 +1,383 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}</ProjectGuid>
+    <RootNamespace>darkplacessdl2</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectName>darkplaces-sdl2-vs2012</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="vs2012_sdl2_win32.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="vs2012_sdl2_win32.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="vs2012_sdl2_win64.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="vs2012_sdl2_win64.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir))\</OutDir>
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>$(SolutionDir)\</OutDir>
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)\</OutDir>
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>$(SolutionDir)\</OutDir>
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>CONFIG_MENU;CONFIG_CD;WIN32;_DEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <IgnoreSpecificDefaultLibraries>msvcrt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>CONFIG_MENU;CONFIG_CD;WIN32;WIN64;_DEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <IgnoreSpecificDefaultLibraries>msvcrt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>CONFIG_MENU;CONFIG_CD;WIN32;NDEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader />
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>CONFIG_MENU;CONFIG_CD;WIN32;WIN64;NDEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader />
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="bih.c" />
+    <ClCompile Include="builddate.c" />
+    <ClCompile Include="cap_avi.c" />
+    <ClCompile Include="cap_ogg.c" />
+    <ClCompile Include="cd_sdl.c" />
+    <ClCompile Include="cd_shared.c" />
+    <ClCompile Include="cl_collision.c" />
+    <ClCompile Include="cl_demo.c" />
+    <ClCompile Include="cl_dyntexture.c" />
+    <ClCompile Include="cl_input.c" />
+    <ClCompile Include="cl_main.c" />
+    <ClCompile Include="cl_parse.c" />
+    <ClCompile Include="cl_particles.c" />
+    <ClCompile Include="cl_screen.c" />
+    <ClCompile Include="cl_video.c" />
+    <ClCompile Include="clvm_cmds.c" />
+    <ClCompile Include="cmd.c" />
+    <ClCompile Include="collision.c" />
+    <ClCompile Include="common.c" />
+    <ClCompile Include="console.c" />
+    <ClCompile Include="crypto.c" />
+    <ClCompile Include="csprogs.c" />
+    <ClCompile Include="curves.c" />
+    <ClCompile Include="cvar.c" />
+    <ClCompile Include="dpsoftrast.c" />
+    <ClCompile Include="dpvsimpledecode.c" />
+    <ClCompile Include="filematch.c" />
+    <ClCompile Include="fractalnoise.c" />
+    <ClCompile Include="fs.c" />
+    <ClCompile Include="ft2.c" />
+    <ClCompile Include="gl_backend.c" />
+    <ClCompile Include="gl_draw.c" />
+    <ClCompile Include="gl_rmain.c" />
+    <ClCompile Include="gl_rsurf.c" />
+    <ClCompile Include="gl_textures.c" />
+    <ClCompile Include="hmac.c" />
+    <ClCompile Include="host.c" />
+    <ClCompile Include="host_cmd.c" />
+    <ClCompile Include="image.c" />
+    <ClCompile Include="image_png.c" />
+    <ClCompile Include="jpeg.c" />
+    <ClCompile Include="keys.c" />
+    <ClCompile Include="lhnet.c" />
+    <ClCompile Include="libcurl.c" />
+    <ClCompile Include="mathlib.c" />
+    <ClCompile Include="matrixlib.c" />
+    <ClCompile Include="mdfour.c" />
+    <ClCompile Include="menu.c" />
+    <ClCompile Include="meshqueue.c" />
+    <ClCompile Include="mod_skeletal_animatevertices_generic.c" />
+    <ClCompile Include="mod_skeletal_animatevertices_sse.c" />
+    <ClCompile Include="model_alias.c" />
+    <ClCompile Include="model_brush.c" />
+    <ClCompile Include="model_shared.c" />
+    <ClCompile Include="model_sprite.c" />
+    <ClCompile Include="mvm_cmds.c" />
+    <ClCompile Include="netconn.c" />
+    <ClCompile Include="palette.c" />
+    <ClCompile Include="polygon.c" />
+    <ClCompile Include="portals.c" />
+    <ClCompile Include="protocol.c" />
+    <ClCompile Include="prvm_cmds.c" />
+    <ClCompile Include="prvm_edict.c" />
+    <ClCompile Include="prvm_exec.c" />
+    <ClCompile Include="r_explosion.c" />
+    <ClCompile Include="r_lightning.c" />
+    <ClCompile Include="r_modules.c" />
+    <ClCompile Include="r_shadow.c" />
+    <ClCompile Include="r_sky.c" />
+    <ClCompile Include="r_sprites.c" />
+    <ClCompile Include="sbar.c" />
+    <ClCompile Include="snd_main.c" />
+    <ClCompile Include="snd_mem.c" />
+    <ClCompile Include="snd_mix.c" />
+    <ClCompile Include="snd_ogg.c" />
+    <ClCompile Include="snd_sdl.c" />
+    <ClCompile Include="snd_wav.c" />
+    <ClCompile Include="sv_demo.c" />
+    <ClCompile Include="sv_main.c" />
+    <ClCompile Include="sv_move.c" />
+    <ClCompile Include="sv_phys.c" />
+    <ClCompile Include="sv_user.c" />
+    <ClCompile Include="svbsp.c" />
+    <ClCompile Include="svvm_cmds.c" />
+    <ClCompile Include="sys_sdl.c" />
+    <ClCompile Include="sys_shared.c" />
+    <ClCompile Include="thread_sdl.c" />
+    <ClCompile Include="utf8lib.c" />
+    <ClCompile Include="vid_sdl.c" />
+    <ClCompile Include="vid_shared.c" />
+    <ClCompile Include="view.c" />
+    <ClCompile Include="wad.c" />
+    <ClCompile Include="world.c" />
+    <ClCompile Include="zone.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="bih.h" />
+    <ClInclude Include="bspfile.h" />
+    <ClInclude Include="cap_avi.h" />
+    <ClInclude Include="cap_ogg.h" />
+    <ClInclude Include="cdaudio.h" />
+    <ClInclude Include="cl_collision.h" />
+    <ClInclude Include="cl_dyntexture.h" />
+    <ClInclude Include="cl_gecko.h" />
+    <ClInclude Include="cl_screen.h" />
+    <ClInclude Include="cl_video.h" />
+    <ClInclude Include="client.h" />
+    <ClInclude Include="clprogdefs.h" />
+    <ClInclude Include="clvm_cmds.h" />
+    <ClInclude Include="cmd.h" />
+    <ClInclude Include="collision.h" />
+    <ClInclude Include="common.h" />
+    <ClInclude Include="console.h" />
+    <ClInclude Include="crypto.h" />
+    <ClInclude Include="csprogs.h" />
+    <ClInclude Include="curves.h" />
+    <ClInclude Include="cvar.h" />
+    <ClInclude Include="dpsoftrast.h" />
+    <ClInclude Include="dpvsimpledecode.h" />
+    <ClInclude Include="draw.h" />
+    <ClInclude Include="fs.h" />
+    <ClInclude Include="ft2.h" />
+    <ClInclude Include="ft2_defs.h" />
+    <ClInclude Include="ft2_fontdefs.h" />
+    <ClInclude Include="gl_backend.h" />
+    <ClInclude Include="glquake.h" />
+    <ClInclude Include="hmac.h" />
+    <ClInclude Include="image.h" />
+    <ClInclude Include="image_png.h" />
+    <ClInclude Include="input.h" />
+    <ClInclude Include="intoverflow.h" />
+    <ClInclude Include="jpeg.h" />
+    <ClInclude Include="keys.h" />
+    <ClInclude Include="lhfont.h" />
+    <ClInclude Include="lhnet.h" />
+    <ClInclude Include="libcurl.h" />
+    <ClInclude Include="mathlib.h" />
+    <ClInclude Include="matrixlib.h" />
+    <ClInclude Include="mdfour.h" />
+    <ClInclude Include="menu.h" />
+    <ClInclude Include="meshqueue.h" />
+    <ClInclude Include="mod_skeletal_animatevertices_generic.h" />
+    <ClInclude Include="mod_skeletal_animatevertices_sse.h" />
+    <ClInclude Include="model_alias.h" />
+    <ClInclude Include="model_brush.h" />
+    <ClInclude Include="model_dpmodel.h" />
+    <ClInclude Include="model_iqm.h" />
+    <ClInclude Include="model_psk.h" />
+    <ClInclude Include="model_shared.h" />
+    <ClInclude Include="model_sprite.h" />
+    <ClInclude Include="model_zymotic.h" />
+    <ClInclude Include="modelgen.h" />
+    <ClInclude Include="mprogdefs.h" />
+    <ClInclude Include="netconn.h" />
+    <ClInclude Include="palette.h" />
+    <ClInclude Include="polygon.h" />
+    <ClInclude Include="portals.h" />
+    <ClInclude Include="pr_comp.h" />
+    <ClInclude Include="progdefs.h" />
+    <ClInclude Include="progs.h" />
+    <ClInclude Include="progsvm.h" />
+    <ClInclude Include="protocol.h" />
+    <ClInclude Include="prvm_cmds.h" />
+    <ClInclude Include="prvm_execprogram.h" />
+    <ClInclude Include="qtypes.h" />
+    <ClInclude Include="quakedef.h" />
+    <ClInclude Include="r_lerpanim.h" />
+    <ClInclude Include="r_modules.h" />
+    <ClInclude Include="r_shadow.h" />
+    <ClInclude Include="r_textures.h" />
+    <ClInclude Include="render.h" />
+    <ClInclude Include="resource.h" />
+    <ClInclude Include="sbar.h" />
+    <ClInclude Include="screen.h" />
+    <ClInclude Include="SDLMain.h" />
+    <ClInclude Include="server.h" />
+    <ClInclude Include="shader_glsl.h" />
+    <ClInclude Include="shader_hlsl.h" />
+    <ClInclude Include="snd_main.h" />
+    <ClInclude Include="snd_ogg.h" />
+    <ClInclude Include="snd_wav.h" />
+    <ClInclude Include="sound.h" />
+    <ClInclude Include="spritegn.h" />
+    <ClInclude Include="sv_demo.h" />
+    <ClInclude Include="svbsp.h" />
+    <ClInclude Include="sys.h" />
+    <ClInclude Include="thread.h" />
+    <ClInclude Include="timing.h" />
+    <ClInclude Include="utf8lib.h" />
+    <ClInclude Include="vid.h" />
+    <ClInclude Include="wad.h" />
+    <ClInclude Include="world.h" />
+    <ClInclude Include="zone.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/darkplaces-sdl2-vs2013.vcxproj b/darkplaces-sdl2-vs2013.vcxproj
new file mode 100644
index 00000000..51c67eb2
--- /dev/null
+++ b/darkplaces-sdl2-vs2013.vcxproj
@@ -0,0 +1,392 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{72D93E63-FDBB-4AA3-B42B-FAADA6D7F5B2}</ProjectGuid>
+    <RootNamespace>darkplacessdl2</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectName>darkplaces-sdl2-vs2013</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="vs2012_sdl2_win32.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="vs2012_sdl2_win32.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="vs2012_sdl2_win64.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="vs2012_sdl2_win64.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir))\</OutDir>
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>$(SolutionDir)\</OutDir>
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)\</OutDir>
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>$(SolutionDir)\</OutDir>
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>CONFIG_MENU;CONFIG_CD;WIN32;_DEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/wd"4201" %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <IgnoreSpecificDefaultLibraries>msvcrt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>CONFIG_MENU;CONFIG_CD;WIN32;WIN64;_DEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/wd"4201" %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <IgnoreSpecificDefaultLibraries>msvcrt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>CONFIG_MENU;CONFIG_CD;WIN32;NDEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader />
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/wd"4201" %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>CONFIG_MENU;CONFIG_CD;WIN32;WIN64;NDEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader />
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <AdditionalOptions>/wd"4201" %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="bih.c" />
+    <ClCompile Include="builddate.c" />
+    <ClCompile Include="cap_avi.c" />
+    <ClCompile Include="cap_ogg.c" />
+    <ClCompile Include="cd_sdl.c" />
+    <ClCompile Include="cd_shared.c" />
+    <ClCompile Include="cl_collision.c" />
+    <ClCompile Include="cl_demo.c" />
+    <ClCompile Include="cl_dyntexture.c" />
+    <ClCompile Include="cl_input.c" />
+    <ClCompile Include="cl_main.c" />
+    <ClCompile Include="cl_parse.c" />
+    <ClCompile Include="cl_particles.c" />
+    <ClCompile Include="cl_screen.c" />
+    <ClCompile Include="cl_video.c" />
+    <ClCompile Include="clvm_cmds.c" />
+    <ClCompile Include="cmd.c" />
+    <ClCompile Include="collision.c" />
+    <ClCompile Include="common.c" />
+    <ClCompile Include="console.c" />
+    <ClCompile Include="crypto.c">
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/wd"4800" %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">/wd"4800" %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/wd"4800" %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/wd"4800" %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <ClCompile Include="csprogs.c" />
+    <ClCompile Include="curves.c" />
+    <ClCompile Include="cvar.c" />
+    <ClCompile Include="dpsoftrast.c" />
+    <ClCompile Include="dpvsimpledecode.c" />
+    <ClCompile Include="filematch.c" />
+    <ClCompile Include="fractalnoise.c" />
+    <ClCompile Include="fs.c" />
+    <ClCompile Include="ft2.c" />
+    <ClCompile Include="gl_backend.c" />
+    <ClCompile Include="gl_draw.c" />
+    <ClCompile Include="gl_rmain.c" />
+    <ClCompile Include="gl_rsurf.c" />
+    <ClCompile Include="gl_textures.c" />
+    <ClCompile Include="hmac.c" />
+    <ClCompile Include="host.c" />
+    <ClCompile Include="host_cmd.c" />
+    <ClCompile Include="image.c" />
+    <ClCompile Include="image_png.c" />
+    <ClCompile Include="jpeg.c" />
+    <ClCompile Include="keys.c" />
+    <ClCompile Include="lhnet.c" />
+    <ClCompile Include="libcurl.c" />
+    <ClCompile Include="mathlib.c" />
+    <ClCompile Include="matrixlib.c" />
+    <ClCompile Include="mdfour.c" />
+    <ClCompile Include="menu.c" />
+    <ClCompile Include="meshqueue.c" />
+    <ClCompile Include="mod_skeletal_animatevertices_generic.c" />
+    <ClCompile Include="mod_skeletal_animatevertices_sse.c" />
+    <ClCompile Include="model_alias.c" />
+    <ClCompile Include="model_brush.c" />
+    <ClCompile Include="model_shared.c" />
+    <ClCompile Include="model_sprite.c" />
+    <ClCompile Include="mvm_cmds.c" />
+    <ClCompile Include="netconn.c" />
+    <ClCompile Include="palette.c" />
+    <ClCompile Include="polygon.c" />
+    <ClCompile Include="portals.c" />
+    <ClCompile Include="protocol.c" />
+    <ClCompile Include="prvm_cmds.c" />
+    <ClCompile Include="prvm_edict.c" />
+    <ClCompile Include="prvm_exec.c" />
+    <ClCompile Include="r_explosion.c" />
+    <ClCompile Include="r_lightning.c" />
+    <ClCompile Include="r_modules.c" />
+    <ClCompile Include="r_shadow.c" />
+    <ClCompile Include="r_sky.c" />
+    <ClCompile Include="r_sprites.c" />
+    <ClCompile Include="sbar.c" />
+    <ClCompile Include="snd_main.c" />
+    <ClCompile Include="snd_mem.c" />
+    <ClCompile Include="snd_mix.c" />
+    <ClCompile Include="snd_ogg.c" />
+    <ClCompile Include="snd_sdl.c" />
+    <ClCompile Include="snd_wav.c" />
+    <ClCompile Include="sv_demo.c" />
+    <ClCompile Include="sv_main.c" />
+    <ClCompile Include="sv_move.c" />
+    <ClCompile Include="sv_phys.c" />
+    <ClCompile Include="sv_user.c" />
+    <ClCompile Include="svbsp.c" />
+    <ClCompile Include="svvm_cmds.c" />
+    <ClCompile Include="sys_sdl.c" />
+    <ClCompile Include="sys_shared.c" />
+    <ClCompile Include="thread_sdl.c" />
+    <ClCompile Include="utf8lib.c" />
+    <ClCompile Include="vid_sdl.c" />
+    <ClCompile Include="vid_shared.c" />
+    <ClCompile Include="view.c" />
+    <ClCompile Include="wad.c" />
+    <ClCompile Include="world.c" />
+    <ClCompile Include="zone.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="bih.h" />
+    <ClInclude Include="bspfile.h" />
+    <ClInclude Include="cap_avi.h" />
+    <ClInclude Include="cap_ogg.h" />
+    <ClInclude Include="cdaudio.h" />
+    <ClInclude Include="cl_collision.h" />
+    <ClInclude Include="cl_dyntexture.h" />
+    <ClInclude Include="cl_gecko.h" />
+    <ClInclude Include="cl_screen.h" />
+    <ClInclude Include="cl_video.h" />
+    <ClInclude Include="client.h" />
+    <ClInclude Include="clprogdefs.h" />
+    <ClInclude Include="clvm_cmds.h" />
+    <ClInclude Include="cmd.h" />
+    <ClInclude Include="collision.h" />
+    <ClInclude Include="common.h" />
+    <ClInclude Include="console.h" />
+    <ClInclude Include="crypto.h" />
+    <ClInclude Include="csprogs.h" />
+    <ClInclude Include="curves.h" />
+    <ClInclude Include="cvar.h" />
+    <ClInclude Include="dpsoftrast.h" />
+    <ClInclude Include="dpvsimpledecode.h" />
+    <ClInclude Include="draw.h" />
+    <ClInclude Include="fs.h" />
+    <ClInclude Include="ft2.h" />
+    <ClInclude Include="ft2_defs.h" />
+    <ClInclude Include="ft2_fontdefs.h" />
+    <ClInclude Include="gl_backend.h" />
+    <ClInclude Include="glquake.h" />
+    <ClInclude Include="hmac.h" />
+    <ClInclude Include="image.h" />
+    <ClInclude Include="image_png.h" />
+    <ClInclude Include="input.h" />
+    <ClInclude Include="intoverflow.h" />
+    <ClInclude Include="jpeg.h" />
+    <ClInclude Include="keys.h" />
+    <ClInclude Include="lhfont.h" />
+    <ClInclude Include="lhnet.h" />
+    <ClInclude Include="libcurl.h" />
+    <ClInclude Include="mathlib.h" />
+    <ClInclude Include="matrixlib.h" />
+    <ClInclude Include="mdfour.h" />
+    <ClInclude Include="menu.h" />
+    <ClInclude Include="meshqueue.h" />
+    <ClInclude Include="mod_skeletal_animatevertices_generic.h" />
+    <ClInclude Include="mod_skeletal_animatevertices_sse.h" />
+    <ClInclude Include="model_alias.h" />
+    <ClInclude Include="model_brush.h" />
+    <ClInclude Include="model_dpmodel.h" />
+    <ClInclude Include="model_iqm.h" />
+    <ClInclude Include="model_psk.h" />
+    <ClInclude Include="model_shared.h" />
+    <ClInclude Include="model_sprite.h" />
+    <ClInclude Include="model_zymotic.h" />
+    <ClInclude Include="modelgen.h" />
+    <ClInclude Include="mprogdefs.h" />
+    <ClInclude Include="netconn.h" />
+    <ClInclude Include="palette.h" />
+    <ClInclude Include="polygon.h" />
+    <ClInclude Include="portals.h" />
+    <ClInclude Include="pr_comp.h" />
+    <ClInclude Include="progdefs.h" />
+    <ClInclude Include="progs.h" />
+    <ClInclude Include="progsvm.h" />
+    <ClInclude Include="protocol.h" />
+    <ClInclude Include="prvm_cmds.h" />
+    <ClInclude Include="prvm_execprogram.h" />
+    <ClInclude Include="qtypes.h" />
+    <ClInclude Include="quakedef.h" />
+    <ClInclude Include="r_lerpanim.h" />
+    <ClInclude Include="r_modules.h" />
+    <ClInclude Include="r_shadow.h" />
+    <ClInclude Include="r_textures.h" />
+    <ClInclude Include="render.h" />
+    <ClInclude Include="resource.h" />
+    <ClInclude Include="sbar.h" />
+    <ClInclude Include="screen.h" />
+    <ClInclude Include="SDLMain.h" />
+    <ClInclude Include="server.h" />
+    <ClInclude Include="shader_glsl.h" />
+    <ClInclude Include="shader_hlsl.h" />
+    <ClInclude Include="snd_main.h" />
+    <ClInclude Include="snd_ogg.h" />
+    <ClInclude Include="snd_wav.h" />
+    <ClInclude Include="sound.h" />
+    <ClInclude Include="spritegn.h" />
+    <ClInclude Include="sv_demo.h" />
+    <ClInclude Include="svbsp.h" />
+    <ClInclude Include="sys.h" />
+    <ClInclude Include="thread.h" />
+    <ClInclude Include="timing.h" />
+    <ClInclude Include="utf8lib.h" />
+    <ClInclude Include="vid.h" />
+    <ClInclude Include="wad.h" />
+    <ClInclude Include="world.h" />
+    <ClInclude Include="zone.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/darkplaces-vs2010.sln b/darkplaces-vs2010.sln
index 0febc775..b97ef0fd 100644
--- a/darkplaces-vs2010.sln
+++ b/darkplaces-vs2010.sln
@@ -1,11 +1,13 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual C++ Express 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-wgl", "darkplaces-wgl-vs2010.vcxproj", "{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-wgl-vs2010", "darkplaces-wgl-vs2010.vcxproj", "{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-sdl", "darkplaces-sdl-vs2010.vcxproj", "{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-sdl-vs2010", "darkplaces-sdl-vs2010.vcxproj", "{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-dedicated", "darkplaces-dedicated-vs2010.vcxproj", "{389AE334-D907-4069-90B3-F0551B3EFDE9}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-dedicated-vs2010", "darkplaces-dedicated-vs2010.vcxproj", "{389AE334-D907-4069-90B3-F0551B3EFDE9}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-sdl2-vs2010", "darkplaces-sdl2-vs2010.vcxproj", "{72D93E63-FDBB-4AA3-B42B-FAADA6D7F5B2}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/darkplaces-vs2012.sln b/darkplaces-vs2012.sln
index 18d8c1c7..8d4aa6bc 100644
--- a/darkplaces-vs2012.sln
+++ b/darkplaces-vs2012.sln
@@ -1,11 +1,13 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Express 2012 for Windows Desktop
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-wgl", "darkplaces-wgl-vs2012.vcxproj", "{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-wgl-vs2012", "darkplaces-wgl-vs2012.vcxproj", "{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-sdl", "darkplaces-sdl-vs2012.vcxproj", "{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-sdl-vs2012", "darkplaces-sdl-vs2012.vcxproj", "{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-dedicated", "darkplaces-dedicated-vs2012.vcxproj", "{389AE334-D907-4069-90B3-F0551B3EFDE9}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-dedicated-vs2012", "darkplaces-dedicated-vs2012.vcxproj", "{389AE334-D907-4069-90B3-F0551B3EFDE9}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-sdl2-vs2012", "darkplaces-sdl2-vs2012.vcxproj", "{72D93E63-FDBB-4AA3-B42B-FAADA6D7F5B2}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/darkplaces-vs2013.sln b/darkplaces-vs2013.sln
index ed2481d5..5e8dfc58 100644
--- a/darkplaces-vs2013.sln
+++ b/darkplaces-vs2013.sln
@@ -1,11 +1,15 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Express 2012 for Windows Desktop
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-wgl", "darkplaces-wgl-vs2013.vcxproj", "{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}"
+# Visual Studio 2013
+VisualStudioVersion = 12.0.31101.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-wgl-vs2013", "darkplaces-wgl-vs2013.vcxproj", "{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-sdl", "darkplaces-sdl-vs2013.vcxproj", "{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-sdl-vs2013", "darkplaces-sdl-vs2013.vcxproj", "{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-dedicated", "darkplaces-dedicated-vs2013.vcxproj", "{389AE334-D907-4069-90B3-F0551B3EFDE9}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-dedicated-vs2013", "darkplaces-dedicated-vs2013.vcxproj", "{389AE334-D907-4069-90B3-F0551B3EFDE9}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-sdl2-vs2013", "darkplaces-sdl2-vs2013.vcxproj", "{72D93E63-FDBB-4AA3-B42B-FAADA6D7F5B2}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -39,6 +43,14 @@ Global
 		{389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|Win32.Build.0 = Release|Win32
 		{389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|x64.ActiveCfg = Release|x64
 		{389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|x64.Build.0 = Release|x64
+		{72D93E63-FDBB-4AA3-B42B-FAADA6D7F5B2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{72D93E63-FDBB-4AA3-B42B-FAADA6D7F5B2}.Debug|Win32.Build.0 = Debug|Win32
+		{72D93E63-FDBB-4AA3-B42B-FAADA6D7F5B2}.Debug|x64.ActiveCfg = Debug|x64
+		{72D93E63-FDBB-4AA3-B42B-FAADA6D7F5B2}.Debug|x64.Build.0 = Debug|x64
+		{72D93E63-FDBB-4AA3-B42B-FAADA6D7F5B2}.Release|Win32.ActiveCfg = Release|Win32
+		{72D93E63-FDBB-4AA3-B42B-FAADA6D7F5B2}.Release|Win32.Build.0 = Release|Win32
+		{72D93E63-FDBB-4AA3-B42B-FAADA6D7F5B2}.Release|x64.ActiveCfg = Release|x64
+		{72D93E63-FDBB-4AA3-B42B-FAADA6D7F5B2}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/darkplaces-wgl-vs2010.vcxproj b/darkplaces-wgl-vs2010.vcxproj
index 3515e804..2daad8b0 100644
--- a/darkplaces-wgl-vs2010.vcxproj
+++ b/darkplaces-wgl-vs2010.vcxproj
@@ -39,11 +39,11 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)-$(ProjectName)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)-$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)-$(ProjectName)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)-$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)</TargetName>
@@ -78,7 +78,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>CompileAsCpp</CompileAs>
       <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;4201;4611;%(DisableSpecificWarnings)</DisableSpecificWarnings>
diff --git a/darkplaces-wgl-vs2012.vcxproj b/darkplaces-wgl-vs2012.vcxproj
index f9ad5fb4..c35763ce 100644
--- a/darkplaces-wgl-vs2012.vcxproj
+++ b/darkplaces-wgl-vs2012.vcxproj
@@ -71,23 +71,23 @@
     <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)$(Configuration)-$(ProjectName)\</OutDir>
-    <IntDir>$(Configuration)-$(ProjectName)\</IntDir>
+    <OutDir>$(SolutionDir))\</OutDir>
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)\</OutDir>
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>$(SolutionDir)\</OutDir>
-    <IntDir>$(Configuration)-$(ProjectName)\</IntDir>
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)\</OutDir>
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/darkplaces-wgl-vs2013.vcxproj b/darkplaces-wgl-vs2013.vcxproj
index de618afb..90186490 100644
--- a/darkplaces-wgl-vs2013.vcxproj
+++ b/darkplaces-wgl-vs2013.vcxproj
@@ -71,23 +71,23 @@
     <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)$(Configuration)-$(ProjectName)\</OutDir>
-    <IntDir>$(Configuration)-$(ProjectName)\</IntDir>
+    <OutDir>$(SolutionDir))\</OutDir>
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)\</OutDir>
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>$(SolutionDir)\</OutDir>
-    <IntDir>$(Configuration)-$(ProjectName)\</IntDir>
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)\</OutDir>
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/sys_sdl.c b/sys_sdl.c
index 228c0a49..7bfb041f 100644
--- a/sys_sdl.c
+++ b/sys_sdl.c
@@ -1,9 +1,5 @@
 
 #ifdef WIN32
-#ifdef _MSC_VER
-#pragma comment(lib, "sdl.lib")
-#pragma comment(lib, "sdlmain.lib")
-#endif
 #include <io.h>
 #include "conio.h"
 #else
@@ -24,6 +20,18 @@
 
 #include <SDL.h>
 
+#ifdef WIN32
+#ifdef _MSC_VER
+#if SDL_MAJOR_VERSION == 1
+#pragma comment(lib, "sdl.lib")
+#pragma comment(lib, "sdlmain.lib")
+#else
+#pragma comment(lib, "sdl2.lib")
+#pragma comment(lib, "sdl2main.lib")
+#endif
+#endif
+#endif
+
 #include "quakedef.h"
 
 // =======================================================================
diff --git a/vid_sdl.c b/vid_sdl.c
index e3c934a7..03af6eaf 100644
--- a/vid_sdl.c
+++ b/vid_sdl.c
@@ -2527,8 +2527,6 @@ static qboolean VID_InitModeGL(viddef_mode_t *mode)
 	// Knghtbrd: should do platform-specific extension string function here
 
 	vid_isfullscreen = false;
-	int xPos = SDL_WINDOWPOS_UNDEFINED;
-	int yPos = SDL_WINDOWPOS_UNDEFINED;
 #if SDL_MAJOR_VERSION == 1
 	{
 		const SDL_VideoInfo *vi = SDL_GetVideoInfo();
@@ -2549,6 +2547,8 @@ static qboolean VID_InitModeGL(viddef_mode_t *mode)
 		}
 	}
 #else
+	int xPos = SDL_WINDOWPOS_UNDEFINED;
+	int yPos = SDL_WINDOWPOS_UNDEFINED;
 	{
 		if (mode->fullscreen) {
 			if (vid_desktopfullscreen.integer)
@@ -2564,7 +2564,6 @@ static qboolean VID_InitModeGL(viddef_mode_t *mode)
 		}
 		else {
 #ifdef WIN32
-			DWORD windowStyle = 0;
 			RECT rect;
 			AdjustWindowBounds(mode, &rect);
 			xPos = rect.left;
diff --git a/vs2010_sdl2_win32.props b/vs2010_sdl2_win32.props
new file mode 100644
index 00000000..0ca4653d
--- /dev/null
+++ b/vs2010_sdl2_win32.props
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <IncludePath>C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Include;C:\dev\SDL2-2.0\include;$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <PropertyGroup>
+    <LibraryPath>C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x86;C:\dev\SDL2-2.0\lib\x86;$(LibraryPath)</LibraryPath>
+    <_PropertySheetDisplayName>vs2010_win32</_PropertySheetDisplayName>
+  </PropertyGroup>
+  <ItemDefinitionGroup />
+  <ItemGroup />
+</Project>
\ No newline at end of file
diff --git a/vs2010_sdl2_win64.props b/vs2010_sdl2_win64.props
new file mode 100644
index 00000000..9539eb51
--- /dev/null
+++ b/vs2010_sdl2_win64.props
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <IncludePath>C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Include;C:\dev\SDL2-2.0\include;$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <PropertyGroup>
+    <LibraryPath>C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x64;C:\dev\SDL2-2.0\lib\x64;$(LibraryPath)</LibraryPath>
+    <_PropertySheetDisplayName>vs2010_win64</_PropertySheetDisplayName>
+  </PropertyGroup>
+  <ItemDefinitionGroup />
+  <ItemGroup />
+</Project>
\ No newline at end of file
diff --git a/vs2012_sdl2_win32.props b/vs2012_sdl2_win32.props
new file mode 100644
index 00000000..e5fa2c1a
--- /dev/null
+++ b/vs2012_sdl2_win32.props
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <IncludePath>C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Include;C:\dev\SDL2-2.0\include;$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <PropertyGroup>
+    <LibraryPath>C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x86;C:\dev\SDL2-2.0\lib\x86;$(LibraryPath)</LibraryPath>
+    <_PropertySheetDisplayName>vs2012_win32</_PropertySheetDisplayName>
+  </PropertyGroup>
+  <ItemDefinitionGroup />
+  <ItemGroup />
+</Project>
\ No newline at end of file
diff --git a/vs2012_sdl2_win64.props b/vs2012_sdl2_win64.props
new file mode 100644
index 00000000..cfe1b950
--- /dev/null
+++ b/vs2012_sdl2_win64.props
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <IncludePath>C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Include;C:\dev\SDL2-2.0\include;$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <PropertyGroup>
+    <LibraryPath>C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x64;C:\dev\SDL2-2.0\lib\x64;$(LibraryPath)</LibraryPath>
+    <_PropertySheetDisplayName>vs2012_win64</_PropertySheetDisplayName>
+  </PropertyGroup>
+  <ItemDefinitionGroup />
+  <ItemGroup />
+</Project>
\ No newline at end of file
-- 
2.39.2