From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Thu, 7 Feb 2013 14:22:17 +0000 (+0000)
Subject: added props files for vs2010 and vs2012, changed name of darkplaces-2010.sln to darkp... 
X-Git-Tag: xonotic-v0.8.0~96^2~144
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=38113e75aa0d780aed5b6b2b18cdd61752d1ca07;p=xonotic%2Fdarkplaces.git

added props files for vs2010 and vs2012, changed name of darkplaces-2010.sln to darkplaces-vs2010.sln and renamed the vcproj files similarly to darkplaces-sdl-vs2010.vcxproj and such.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11895 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/darkplaces-2010.sln b/darkplaces-2010.sln
deleted file mode 100644
index 94a77225..00000000
--- a/darkplaces-2010.sln
+++ /dev/null
@@ -1,46 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual C++ Express 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-wgl", "darkplaces-wgl.vcxproj", "{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-sdl", "darkplaces-sdl.vcxproj", "{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-dedicated", "darkplaces-dedicated.vcxproj", "{389AE334-D907-4069-90B3-F0551B3EFDE9}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Debug|Win32.Build.0 = Debug|Win32
-		{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Debug|x64.ActiveCfg = Debug|Win32
-		{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Debug|x64.Build.0 = Debug|Win32
-		{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Release|Win32.ActiveCfg = Release|Win32
-		{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Release|Win32.Build.0 = Release|Win32
-		{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Release|x64.ActiveCfg = Release|Win32
-		{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Release|x64.Build.0 = Release|Win32
-		{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Debug|Win32.Build.0 = Debug|Win32
-		{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Debug|x64.ActiveCfg = Debug|Win32
-		{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Debug|x64.Build.0 = Debug|Win32
-		{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Release|Win32.ActiveCfg = Release|Win32
-		{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Release|Win32.Build.0 = Release|Win32
-		{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Release|x64.ActiveCfg = Release|Win32
-		{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Release|x64.Build.0 = Release|Win32
-		{389AE334-D907-4069-90B3-F0551B3EFDE9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{389AE334-D907-4069-90B3-F0551B3EFDE9}.Debug|Win32.Build.0 = Debug|Win32
-		{389AE334-D907-4069-90B3-F0551B3EFDE9}.Debug|x64.ActiveCfg = Debug|Win32
-		{389AE334-D907-4069-90B3-F0551B3EFDE9}.Debug|x64.Build.0 = Debug|Win32
-		{389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|Win32.ActiveCfg = Release|Win32
-		{389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|Win32.Build.0 = Release|Win32
-		{389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|x64.ActiveCfg = Release|Win32
-		{389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|x64.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/darkplaces-dedicated-vs2012.vcxproj b/darkplaces-dedicated-vs2012.vcxproj
index dfab0b9c..a8688b3d 100644
--- a/darkplaces-dedicated-vs2012.vcxproj
+++ b/darkplaces-dedicated-vs2012.vcxproj
@@ -5,51 +5,90 @@
       <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>{389AE334-D907-4069-90B3-F0551B3EFDE9}</ProjectGuid>
     <RootNamespace>darkplacesdedicated</RootNamespace>
     <Keyword>Win32Proj</Keyword>
-    <ProjectName>darkplaces-dedicated-2012</ProjectName>
+    <ProjectName>darkplaces-dedicated-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>
-    <PlatformToolset>v110</PlatformToolset>
   </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="..\..\Users\havoc\Documents\msdev-settings\lordhavoc_vs2010_win32.props" />
+    <Import Project="vs2012_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="..\..\Users\havoc\Documents\msdev-settings\lordhavoc_vs2010_win32.props" />
+    <Import Project="vs2012_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_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_win64.props" />
   </ImportGroup>
   <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>
-    <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>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)</TargetName>
+    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)-$(ProjectName)\</OutDir>
+    <IntDir>$(Configuration)-$(ProjectName)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)-$(ProjectName)\</OutDir>
+    <IntDir>$(Configuration)-$(ProjectName)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -58,8 +97,7 @@
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>
@@ -71,6 +109,28 @@
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</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>Console</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
@@ -78,13 +138,13 @@
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader />
       <WarningLevel>Level3</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>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -92,6 +152,30 @@
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</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>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="bih.c" />
     <ClCompile Include="builddate.c" />
diff --git a/darkplaces-dedicated.vcxproj b/darkplaces-dedicated.vcxproj
deleted file mode 100644
index 79bc9abc..00000000
--- a/darkplaces-dedicated.vcxproj
+++ /dev/null
@@ -1,285 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{389AE334-D907-4069-90B3-F0551B3EFDE9}</ProjectGuid>
-    <RootNamespace>darkplacesdedicated</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="..\..\Users\havoc\Documents\msdev-settings\lordhavoc_vs2010_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="..\..\Users\havoc\Documents\msdev-settings\lordhavoc_vs2010_win32.props" />
-  </ImportGroup>
-  <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>
-    <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>
-    <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>WIN32;_DEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</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_null.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_null.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_linux.c" />
-    <ClCompile Include="sys_shared.c" />
-    <ClCompile Include="thread_null.c" />
-    <ClCompile Include="utf8lib.c" />
-    <ClCompile Include="vid_null.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="server.h" />
-    <ClInclude Include="shader_glsl.h" />
-    <ClInclude Include="shader_hlsl.h" />
-    <ClInclude Include="snd_main.h" />
-    <ClInclude Include="snd_modplug.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-sdl-vs2012.vcxproj b/darkplaces-sdl-vs2012.vcxproj
index cdc33f26..5f16c7d1 100644
--- a/darkplaces-sdl-vs2012.vcxproj
+++ b/darkplaces-sdl-vs2012.vcxproj
@@ -5,10 +5,18 @@
       <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>
@@ -19,37 +27,68 @@
   <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>
-    <PlatformToolset>v110</PlatformToolset>
   </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="..\..\Users\havoc\Documents\msdev-settings\lordhavoc_vs2010_win32.props" />
+    <Import Project="vs2012_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="..\..\Users\havoc\Documents\msdev-settings\lordhavoc_vs2010_win32.props" />
+    <Import Project="vs2012_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_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_win64.props" />
   </ImportGroup>
   <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>
-    <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>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)</TargetName>
+    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)-$(ProjectName)\</OutDir>
+    <IntDir>$(Configuration)-$(ProjectName)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)-$(ProjectName)\</OutDir>
+    <IntDir>$(Configuration)-$(ProjectName)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -58,8 +97,7 @@
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>
@@ -72,6 +110,29 @@
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>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>
+    </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>
@@ -79,8 +140,7 @@
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>
@@ -94,6 +154,30 @@
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>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>
+    </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" />
diff --git a/darkplaces-sdl.vcxproj b/darkplaces-sdl.vcxproj
deleted file mode 100644
index c6ea128c..00000000
--- a/darkplaces-sdl.vcxproj
+++ /dev/null
@@ -1,294 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}</ProjectGuid>
-    <RootNamespace>darkplacessdl</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="..\..\Users\havoc\Documents\msdev-settings\lordhavoc_vs2010_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="..\..\Users\havoc\Documents\msdev-settings\lordhavoc_vs2010_win32.props" />
-  </ImportGroup>
-  <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>
-    <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>
-    <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>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>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_modplug.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_modplug.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
new file mode 100644
index 00000000..0febc775
--- /dev/null
+++ b/darkplaces-vs2010.sln
@@ -0,0 +1,46 @@
+
+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}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-sdl", "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}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Debug|Win32.Build.0 = Debug|Win32
+		{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Debug|x64.ActiveCfg = Debug|Win32
+		{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Debug|x64.Build.0 = Debug|Win32
+		{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Release|Win32.ActiveCfg = Release|Win32
+		{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Release|Win32.Build.0 = Release|Win32
+		{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Release|x64.ActiveCfg = Release|Win32
+		{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Release|x64.Build.0 = Release|Win32
+		{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Debug|Win32.Build.0 = Debug|Win32
+		{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Debug|x64.ActiveCfg = Debug|Win32
+		{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Debug|x64.Build.0 = Debug|Win32
+		{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Release|Win32.ActiveCfg = Release|Win32
+		{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Release|Win32.Build.0 = Release|Win32
+		{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Release|x64.ActiveCfg = Release|Win32
+		{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Release|x64.Build.0 = Release|Win32
+		{389AE334-D907-4069-90B3-F0551B3EFDE9}.Debug|Win32.ActiveCfg = Debug|Win32
+		{389AE334-D907-4069-90B3-F0551B3EFDE9}.Debug|Win32.Build.0 = Debug|Win32
+		{389AE334-D907-4069-90B3-F0551B3EFDE9}.Debug|x64.ActiveCfg = Debug|Win32
+		{389AE334-D907-4069-90B3-F0551B3EFDE9}.Debug|x64.Build.0 = Debug|Win32
+		{389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|Win32.ActiveCfg = Release|Win32
+		{389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|Win32.Build.0 = Release|Win32
+		{389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|x64.ActiveCfg = Release|Win32
+		{389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|x64.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/darkplaces-vs2012.sln b/darkplaces-vs2012.sln
index c355d0e0..18d8c1c7 100644
--- a/darkplaces-vs2012.sln
+++ b/darkplaces-vs2012.sln
@@ -1,6 +1,6 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual C++ Express 2010
+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}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-sdl", "darkplaces-sdl-vs2012.vcxproj", "{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}"
@@ -17,28 +17,28 @@ Global
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Debug|Win32.ActiveCfg = Debug|Win32
 		{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Debug|Win32.Build.0 = Debug|Win32
-		{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Debug|x64.ActiveCfg = Debug|Win32
-		{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Debug|x64.Build.0 = Debug|Win32
+		{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Debug|x64.ActiveCfg = Debug|x64
+		{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Debug|x64.Build.0 = Debug|x64
 		{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Release|Win32.ActiveCfg = Release|Win32
 		{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Release|Win32.Build.0 = Release|Win32
-		{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Release|x64.ActiveCfg = Release|Win32
-		{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Release|x64.Build.0 = Release|Win32
+		{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Release|x64.ActiveCfg = Release|x64
+		{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Release|x64.Build.0 = Release|x64
 		{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Debug|Win32.ActiveCfg = Debug|Win32
 		{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Debug|Win32.Build.0 = Debug|Win32
-		{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Debug|x64.ActiveCfg = Debug|Win32
-		{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Debug|x64.Build.0 = Debug|Win32
+		{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Debug|x64.ActiveCfg = Debug|x64
+		{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Debug|x64.Build.0 = Debug|x64
 		{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Release|Win32.ActiveCfg = Release|Win32
 		{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Release|Win32.Build.0 = Release|Win32
-		{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Release|x64.ActiveCfg = Release|Win32
-		{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Release|x64.Build.0 = Release|Win32
+		{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Release|x64.ActiveCfg = Release|x64
+		{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Release|x64.Build.0 = Release|x64
 		{389AE334-D907-4069-90B3-F0551B3EFDE9}.Debug|Win32.ActiveCfg = Debug|Win32
 		{389AE334-D907-4069-90B3-F0551B3EFDE9}.Debug|Win32.Build.0 = Debug|Win32
-		{389AE334-D907-4069-90B3-F0551B3EFDE9}.Debug|x64.ActiveCfg = Debug|Win32
-		{389AE334-D907-4069-90B3-F0551B3EFDE9}.Debug|x64.Build.0 = Debug|Win32
+		{389AE334-D907-4069-90B3-F0551B3EFDE9}.Debug|x64.ActiveCfg = Debug|x64
+		{389AE334-D907-4069-90B3-F0551B3EFDE9}.Debug|x64.Build.0 = Debug|x64
 		{389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|Win32.ActiveCfg = Release|Win32
 		{389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|Win32.Build.0 = Release|Win32
-		{389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|x64.ActiveCfg = Release|Win32
-		{389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|x64.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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/darkplaces-wgl-vs2012.vcxproj b/darkplaces-wgl-vs2012.vcxproj
index af25042c..297de121 100644
--- a/darkplaces-wgl-vs2012.vcxproj
+++ b/darkplaces-wgl-vs2012.vcxproj
@@ -5,10 +5,18 @@
       <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>{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}</ProjectGuid>
@@ -19,37 +27,68 @@
   <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>
-    <PlatformToolset>v110</PlatformToolset>
   </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="..\..\Users\havoc\Documents\msdev-settings\lordhavoc_vs2010_win32.props" />
+    <Import Project="vs2012_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="..\..\Users\havoc\Documents\msdev-settings\lordhavoc_vs2010_win32.props" />
+    <Import Project="vs2012_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_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_win64.props" />
   </ImportGroup>
   <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>
-    <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>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)</TargetName>
+    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)-$(ProjectName)\</OutDir>
+    <IntDir>$(Configuration)-$(ProjectName)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)-$(ProjectName)\</OutDir>
+    <IntDir>$(Configuration)-$(ProjectName)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -58,8 +97,7 @@
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -72,6 +110,29 @@
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;SUPPORTDIRECTX;SUPPORTD3D;_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>
+      <CompileAs>CompileAsCpp</CompileAs>
+      <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;4201;4611;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
@@ -79,8 +140,7 @@
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;SUPPORTDIRECTX;SUPPORTD3D;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
+      <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -95,6 +155,31 @@
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;SUPPORTDIRECTX;SUPPORTD3D;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsCpp</CompileAs>
+      <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;4201;4611;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </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" />
diff --git a/darkplaces-wgl.vcxproj b/darkplaces-wgl.vcxproj
deleted file mode 100644
index 85d04b86..00000000
--- a/darkplaces-wgl.vcxproj
+++ /dev/null
@@ -1,298 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}</ProjectGuid>
-    <RootNamespace>darkplaceswgl</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="..\..\Users\havoc\Documents\msdev-settings\lordhavoc_vs2010_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="..\..\Users\havoc\Documents\msdev-settings\lordhavoc_vs2010_win32.props" />
-  </ImportGroup>
-  <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>
-    <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>
-    <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>WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;SUPPORTDIRECTX;SUPPORTD3D;_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>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;4201;4611;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <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>WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;SUPPORTDIRECTX;SUPPORTD3D;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsCpp</CompileAs>
-      <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;4201;4611;%(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_shared.c" />
-    <ClCompile Include="cd_win.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_modplug.c" />
-    <ClCompile Include="snd_ogg.c" />
-    <ClCompile Include="snd_wav.c" />
-    <ClCompile Include="snd_win.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_shared.c" />
-    <ClCompile Include="sys_win.c" />
-    <ClCompile Include="thread_win.c" />
-    <ClCompile Include="utf8lib.c" />
-    <ClCompile Include="vid_shared.c" />
-    <ClCompile Include="vid_wgl.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="conproc.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="server.h" />
-    <ClInclude Include="shader_glsl.h" />
-    <ClInclude Include="shader_hlsl.h" />
-    <ClInclude Include="snd_main.h" />
-    <ClInclude Include="snd_modplug.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>
-  <ItemGroup>
-    <ResourceCompile Include="darkplaces.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/vs2010_win32.props b/vs2010_win32.props
new file mode 100644
index 00000000..a5d12987
--- /dev/null
+++ b/vs2010_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\SDL-1.2\include;$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <PropertyGroup>
+    <LibraryPath>C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x86;C:\dev\SDL-1.2\lib\x86;$(LibraryPath)</LibraryPath>
+    <_PropertySheetDisplayName>vs2010_win32</_PropertySheetDisplayName>
+  </PropertyGroup>
+  <ItemDefinitionGroup />
+  <ItemGroup />
+</Project>
\ No newline at end of file
diff --git a/vs2010_win64.props b/vs2010_win64.props
new file mode 100644
index 00000000..4d7b1f26
--- /dev/null
+++ b/vs2010_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\SDL-1.2\include;$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <PropertyGroup>
+    <LibraryPath>C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x64;C:\dev\SDL-1.2\lib\x64;$(LibraryPath)</LibraryPath>
+    <_PropertySheetDisplayName>vs2010_win64</_PropertySheetDisplayName>
+  </PropertyGroup>
+  <ItemDefinitionGroup />
+  <ItemGroup />
+</Project>
\ No newline at end of file
diff --git a/vs2012_win32.props b/vs2012_win32.props
new file mode 100644
index 00000000..49427b61
--- /dev/null
+++ b/vs2012_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\SDL-1.2\include;$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <PropertyGroup>
+    <LibraryPath>C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x86;C:\dev\SDL-1.2\lib\x86;$(LibraryPath)</LibraryPath>
+    <_PropertySheetDisplayName>vs2012_win32</_PropertySheetDisplayName>
+  </PropertyGroup>
+  <ItemDefinitionGroup />
+  <ItemGroup />
+</Project>
\ No newline at end of file
diff --git a/vs2012_win64.props b/vs2012_win64.props
new file mode 100644
index 00000000..5dce2161
--- /dev/null
+++ b/vs2012_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\SDL-1.2\include;$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <PropertyGroup>
+    <LibraryPath>C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x64;C:\dev\SDL-1.2\lib\x64;$(LibraryPath)</LibraryPath>
+    <_PropertySheetDisplayName>vs2012_win64</_PropertySheetDisplayName>
+  </PropertyGroup>
+  <ItemDefinitionGroup />
+  <ItemGroup />
+</Project>
\ No newline at end of file