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
::stable-branch::merge=59d9acac0b803124032d42df4b7a5d03021ab16e

diff --git a/darkplaces-dedicated-vs2010.vcxproj b/darkplaces-dedicated-vs2010.vcxproj
index 2d601db78f5feca6f3d950ee84ffd73188cdec9c..92b37c95a4271fa0cf0d64ec43118ec637819e82 100644 (file)
--- a/darkplaces-dedicated-vs2010.vcxproj
+++ b/darkplaces-dedicated-vs2010.vcxproj
@@ -39,11 +39,11 @@
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)-$(ProjectName)\</OutDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)-$(ProjectName)\</IntDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\</OutDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)-$(ProjectName)\</OutDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)-$(ProjectName)\</IntDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\</OutDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>\r
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)</TargetName>\r
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)</TargetName>\r
@@ -57,7 +57,7 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
-      <WarningLevel>Level3</WarningLevel>\r
+      <WarningLevel>Level4</WarningLevel>\r
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
       <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
@@ -77,7 +77,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
-      <WarningLevel>Level3</WarningLevel>\r
+      <WarningLevel>Level4</WarningLevel>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r

diff --git a/darkplaces-dedicated-vs2012.vcxproj b/darkplaces-dedicated-vs2012.vcxproj
index 7d8f85f2cbe76226b97d4a3eed4c9ce20e81c3bc..0f17ffef678e5077ea0a92c170d7b368d3fb5fd0 100644 (file)
--- a/darkplaces-dedicated-vs2012.vcxproj
+++ b/darkplaces-dedicated-vs2012.vcxproj
@@ -71,23 +71,23 @@
     <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
-    <OutDir>$(SolutionDir)$(Configuration)-$(ProjectName)\</OutDir>\r
-    <IntDir>$(Configuration)-$(ProjectName)-DED\</IntDir>\r
+    <OutDir>$(SolutionDir))\</OutDir>\r
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>\r
     <LinkIncremental>true</LinkIncremental>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
-    <IntDir>$(Platform)\$(Configuration)-DED\</IntDir>\r
+    <OutDir>$(SolutionDir)\</OutDir>\r
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>\r
     <LinkIncremental>true</LinkIncremental>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <OutDir>$(SolutionDir)\</OutDir>\r
-    <IntDir>$(Configuration)-$(ProjectName)-DED\</IntDir>\r
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>\r
     <LinkIncremental>false</LinkIncremental>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
-    <IntDir>$(Platform)\$(Configuration)-DED\</IntDir>\r
+    <OutDir>$(SolutionDir)\</OutDir>\r
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>\r
     <LinkIncremental>false</LinkIncremental>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
@@ -98,7 +98,7 @@
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <PrecompiledHeader />\r
-      <WarningLevel>Level3</WarningLevel>\r
+      <WarningLevel>Level4</WarningLevel>\r
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
       <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
       <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
@@ -121,7 +121,7 @@
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <PrecompiledHeader />\r
-      <WarningLevel>Level3</WarningLevel>\r
+      <WarningLevel>Level4</WarningLevel>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
       <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
@@ -141,7 +141,7 @@
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
       <PrecompiledHeader />\r
-      <WarningLevel>Level3</WarningLevel>\r
+      <WarningLevel>Level4</WarningLevel>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
       <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
@@ -166,7 +166,7 @@
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
       <PrecompiledHeader />\r
-      <WarningLevel>Level3</WarningLevel>\r
+      <WarningLevel>Level4</WarningLevel>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
       <MultiProcessorCompilation>true</MultiProcessorCompilation>\r

diff --git a/darkplaces-dedicated-vs2013.vcxproj b/darkplaces-dedicated-vs2013.vcxproj
index ff19a776199e0e9088484ea249a519b4b875c278..4a85b17074cb7e6c343734881959165f7b997f37 100644 (file)
--- a/darkplaces-dedicated-vs2013.vcxproj
+++ b/darkplaces-dedicated-vs2013.vcxproj
@@ -71,23 +71,23 @@
     <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
-    <OutDir>$(SolutionDir)$(Configuration)-$(ProjectName)\</OutDir>\r
-    <IntDir>$(Configuration)-$(ProjectName)-DED\</IntDir>\r
+    <OutDir>$(SolutionDir))\</OutDir>\r
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>\r
     <LinkIncremental>true</LinkIncremental>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
-    <IntDir>$(Platform)\$(Configuration)-DED\</IntDir>\r
+    <OutDir>$(SolutionDir)\</OutDir>\r
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>\r
     <LinkIncremental>true</LinkIncremental>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <OutDir>$(SolutionDir)\</OutDir>\r
-    <IntDir>$(Configuration)-$(ProjectName)-DED\</IntDir>\r
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>\r
     <LinkIncremental>false</LinkIncremental>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
-    <IntDir>$(Platform)\$(Configuration)-DED\</IntDir>\r
+    <OutDir>$(SolutionDir)\</OutDir>\r
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>\r
     <LinkIncremental>false</LinkIncremental>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
@@ -98,7 +98,7 @@
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <PrecompiledHeader />\r
-      <WarningLevel>Level3</WarningLevel>\r
+      <WarningLevel>Level4</WarningLevel>\r
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
       <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
       <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
@@ -122,7 +122,7 @@
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <PrecompiledHeader />\r
-      <WarningLevel>Level3</WarningLevel>\r
+      <WarningLevel>Level4</WarningLevel>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
       <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
@@ -143,7 +143,7 @@
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
       <PrecompiledHeader />\r
-      <WarningLevel>Level3</WarningLevel>\r
+      <WarningLevel>Level4</WarningLevel>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
       <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
@@ -169,7 +169,7 @@
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
       <PrecompiledHeader />\r
-      <WarningLevel>Level3</WarningLevel>\r
+      <WarningLevel>Level4</WarningLevel>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
       <MultiProcessorCompilation>true</MultiProcessorCompilation>\r

diff --git a/darkplaces-sdl-vs2010.vcxproj b/darkplaces-sdl-vs2010.vcxproj
index 912237b0a00b6e993e34c56dead233cf2d97ce01..4d93ef332511f57bfe3598376658f3692281c0c3 100644 (file)
--- a/darkplaces-sdl-vs2010.vcxproj
+++ b/darkplaces-sdl-vs2010.vcxproj
@@ -39,11 +39,11 @@
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)-$(ProjectName)\</OutDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)-$(ProjectName)\</IntDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\</OutDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)-$(ProjectName)\</OutDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)-$(ProjectName)\</IntDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\</OutDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>\r
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)</TargetName>\r
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)</TargetName>\r

diff --git a/darkplaces-sdl-vs2012.vcxproj b/darkplaces-sdl-vs2012.vcxproj
index 0e18231896d8cccc49f7c3a0dabed01d8c6bb249..551ed83d013cf35d011965ab02226de1a57cb490 100644 (file)
--- a/darkplaces-sdl-vs2012.vcxproj
+++ b/darkplaces-sdl-vs2012.vcxproj
@@ -71,23 +71,23 @@
     <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
-    <OutDir>$(SolutionDir)$(Configuration)-$(ProjectName)\</OutDir>\r
-    <IntDir>$(Configuration)-$(ProjectName)-SDL\</IntDir>\r
+    <OutDir>$(SolutionDir))\</OutDir>\r
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>\r
     <LinkIncremental>true</LinkIncremental>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
-    <IntDir>$(Platform)\$(Configuration)-SDL\</IntDir>\r
+    <OutDir>$(SolutionDir)\</OutDir>\r
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>\r
     <LinkIncremental>true</LinkIncremental>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <OutDir>$(SolutionDir)\</OutDir>\r
-    <IntDir>$(Configuration)-$(ProjectName)-SDL\</IntDir>\r
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>\r
     <LinkIncremental>false</LinkIncremental>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
-    <IntDir>$(Platform)\$(Configuration)-SDL\</IntDir>\r
+    <OutDir>$(SolutionDir)\</OutDir>\r
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>\r
     <LinkIncremental>false</LinkIncremental>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r

diff --git a/darkplaces-sdl-vs2013.vcxproj b/darkplaces-sdl-vs2013.vcxproj
index c7ddf2742bdb37e6a4ecafe23c02563677dc4c55..0f8833900c08b38725370745dfa183f3b00b311c 100644 (file)
--- a/darkplaces-sdl-vs2013.vcxproj
+++ b/darkplaces-sdl-vs2013.vcxproj
@@ -71,23 +71,23 @@
     <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
-    <OutDir>$(SolutionDir)$(Configuration)-$(ProjectName)\</OutDir>\r
-    <IntDir>$(Configuration)-$(ProjectName)-SDL\</IntDir>\r
+    <OutDir>$(SolutionDir))\</OutDir>\r
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>\r
     <LinkIncremental>true</LinkIncremental>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
-    <IntDir>$(Platform)\$(Configuration)-SDL\</IntDir>\r
+    <OutDir>$(SolutionDir)\</OutDir>\r
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>\r
     <LinkIncremental>true</LinkIncremental>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <OutDir>$(SolutionDir)\</OutDir>\r
-    <IntDir>$(Configuration)-$(ProjectName)-SDL\</IntDir>\r
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>\r
     <LinkIncremental>false</LinkIncremental>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
-    <IntDir>$(Platform)\$(Configuration)-SDL\</IntDir>\r
+    <OutDir>$(SolutionDir)\</OutDir>\r
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>\r
     <LinkIncremental>false</LinkIncremental>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r

diff --git a/darkplaces-sdl2-vs2010.vcxproj b/darkplaces-sdl2-vs2010.vcxproj
new file mode 100644 (file)
index 0000000..9401d14
--- /dev/null
+++ b/darkplaces-sdl2-vs2010.vcxproj
@@ -0,0 +1,292 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|Win32">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|Win32">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}</ProjectGuid>\r
+    <RootNamespace>darkplacessdl2</RootNamespace>\r
+    <Keyword>Win32Proj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+    <Import Project="vs2010_sdl2_win32.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+    <Import Project="vs2010_sdl2_win32.props" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup>\r
+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\</OutDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>\r
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\</OutDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>\r
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)</TargetName>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <ClCompile>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>CONFIG_MENU;CONFIG_CD;WIN32;_DEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <MinimalRebuild>true</MinimalRebuild>\r
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level4</WarningLevel>\r
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
+      <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+    </ClCompile>\r
+    <Link>\r
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>\r
+      <IgnoreSpecificDefaultLibraries>msvcrt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <SubSystem>Windows</SubSystem>\r
+      <TargetMachine>MachineX86</TargetMachine>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <ClCompile>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <IntrinsicFunctions>true</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>CONFIG_MENU;CONFIG_CD;WIN32;NDEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <WarningLevel>Level4</WarningLevel>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+    </ClCompile>\r
+    <Link>\r
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <SubSystem>Windows</SubSystem>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <TargetMachine>MachineX86</TargetMachine>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="bih.c" />\r
+    <ClCompile Include="builddate.c" />\r
+    <ClCompile Include="cap_avi.c" />\r
+    <ClCompile Include="cap_ogg.c" />\r
+    <ClCompile Include="cd_sdl.c" />\r
+    <ClCompile Include="cd_shared.c" />\r
+    <ClCompile Include="cl_collision.c" />\r
+    <ClCompile Include="cl_demo.c" />\r
+    <ClCompile Include="cl_dyntexture.c" />\r
+    <ClCompile Include="cl_input.c" />\r
+    <ClCompile Include="cl_main.c" />\r
+    <ClCompile Include="cl_parse.c" />\r
+    <ClCompile Include="cl_particles.c" />\r
+    <ClCompile Include="cl_screen.c" />\r
+    <ClCompile Include="cl_video.c" />\r
+    <ClCompile Include="clvm_cmds.c" />\r
+    <ClCompile Include="cmd.c" />\r
+    <ClCompile Include="collision.c" />\r
+    <ClCompile Include="common.c" />\r
+    <ClCompile Include="console.c" />\r
+    <ClCompile Include="crypto.c" />\r
+    <ClCompile Include="csprogs.c" />\r
+    <ClCompile Include="curves.c" />\r
+    <ClCompile Include="cvar.c" />\r
+    <ClCompile Include="dpsoftrast.c" />\r
+    <ClCompile Include="dpvsimpledecode.c" />\r
+    <ClCompile Include="filematch.c" />\r
+    <ClCompile Include="fractalnoise.c" />\r
+    <ClCompile Include="fs.c" />\r
+    <ClCompile Include="ft2.c" />\r
+    <ClCompile Include="gl_backend.c" />\r
+    <ClCompile Include="gl_draw.c" />\r
+    <ClCompile Include="gl_rmain.c" />\r
+    <ClCompile Include="gl_rsurf.c" />\r
+    <ClCompile Include="gl_textures.c" />\r
+    <ClCompile Include="hmac.c" />\r
+    <ClCompile Include="host.c" />\r
+    <ClCompile Include="host_cmd.c" />\r
+    <ClCompile Include="image.c" />\r
+    <ClCompile Include="image_png.c" />\r
+    <ClCompile Include="jpeg.c" />\r
+    <ClCompile Include="keys.c" />\r
+    <ClCompile Include="lhnet.c" />\r
+    <ClCompile Include="libcurl.c" />\r
+    <ClCompile Include="mathlib.c" />\r
+    <ClCompile Include="matrixlib.c" />\r
+    <ClCompile Include="mdfour.c" />\r
+    <ClCompile Include="menu.c" />\r
+    <ClCompile Include="meshqueue.c" />\r
+    <ClCompile Include="mod_skeletal_animatevertices_generic.c" />\r
+    <ClCompile Include="mod_skeletal_animatevertices_sse.c" />\r
+    <ClCompile Include="model_alias.c" />\r
+    <ClCompile Include="model_brush.c" />\r
+    <ClCompile Include="model_shared.c" />\r
+    <ClCompile Include="model_sprite.c" />\r
+    <ClCompile Include="mvm_cmds.c" />\r
+    <ClCompile Include="netconn.c" />\r
+    <ClCompile Include="palette.c" />\r
+    <ClCompile Include="polygon.c" />\r
+    <ClCompile Include="portals.c" />\r
+    <ClCompile Include="protocol.c" />\r
+    <ClCompile Include="prvm_cmds.c" />\r
+    <ClCompile Include="prvm_edict.c" />\r
+    <ClCompile Include="prvm_exec.c" />\r
+    <ClCompile Include="r_explosion.c" />\r
+    <ClCompile Include="r_lightning.c" />\r
+    <ClCompile Include="r_modules.c" />\r
+    <ClCompile Include="r_shadow.c" />\r
+    <ClCompile Include="r_sky.c" />\r
+    <ClCompile Include="r_sprites.c" />\r
+    <ClCompile Include="sbar.c" />\r
+    <ClCompile Include="snd_main.c" />\r
+    <ClCompile Include="snd_mem.c" />\r
+    <ClCompile Include="snd_mix.c" />\r
+    <ClCompile Include="snd_ogg.c" />\r
+    <ClCompile Include="snd_sdl.c" />\r
+    <ClCompile Include="snd_wav.c" />\r
+    <ClCompile Include="sv_demo.c" />\r
+    <ClCompile Include="sv_main.c" />\r
+    <ClCompile Include="sv_move.c" />\r
+    <ClCompile Include="sv_phys.c" />\r
+    <ClCompile Include="sv_user.c" />\r
+    <ClCompile Include="svbsp.c" />\r
+    <ClCompile Include="svvm_cmds.c" />\r
+    <ClCompile Include="sys_sdl.c" />\r
+    <ClCompile Include="sys_shared.c" />\r
+    <ClCompile Include="thread_sdl.c" />\r
+    <ClCompile Include="utf8lib.c" />\r
+    <ClCompile Include="vid_sdl.c" />\r
+    <ClCompile Include="vid_shared.c" />\r
+    <ClCompile Include="view.c" />\r
+    <ClCompile Include="wad.c" />\r
+    <ClCompile Include="world.c" />\r
+    <ClCompile Include="zone.c" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="bih.h" />\r
+    <ClInclude Include="bspfile.h" />\r
+    <ClInclude Include="cap_avi.h" />\r
+    <ClInclude Include="cap_ogg.h" />\r
+    <ClInclude Include="cdaudio.h" />\r
+    <ClInclude Include="cl_collision.h" />\r
+    <ClInclude Include="cl_dyntexture.h" />\r
+    <ClInclude Include="cl_gecko.h" />\r
+    <ClInclude Include="cl_screen.h" />\r
+    <ClInclude Include="cl_video.h" />\r
+    <ClInclude Include="client.h" />\r
+    <ClInclude Include="clprogdefs.h" />\r
+    <ClInclude Include="clvm_cmds.h" />\r
+    <ClInclude Include="cmd.h" />\r
+    <ClInclude Include="collision.h" />\r
+    <ClInclude Include="common.h" />\r
+    <ClInclude Include="console.h" />\r
+    <ClInclude Include="crypto.h" />\r
+    <ClInclude Include="csprogs.h" />\r
+    <ClInclude Include="curves.h" />\r
+    <ClInclude Include="cvar.h" />\r
+    <ClInclude Include="dpsoftrast.h" />\r
+    <ClInclude Include="dpvsimpledecode.h" />\r
+    <ClInclude Include="draw.h" />\r
+    <ClInclude Include="fs.h" />\r
+    <ClInclude Include="ft2.h" />\r
+    <ClInclude Include="ft2_defs.h" />\r
+    <ClInclude Include="ft2_fontdefs.h" />\r
+    <ClInclude Include="gl_backend.h" />\r
+    <ClInclude Include="glquake.h" />\r
+    <ClInclude Include="hmac.h" />\r
+    <ClInclude Include="image.h" />\r
+    <ClInclude Include="image_png.h" />\r
+    <ClInclude Include="input.h" />\r
+    <ClInclude Include="intoverflow.h" />\r
+    <ClInclude Include="jpeg.h" />\r
+    <ClInclude Include="keys.h" />\r
+    <ClInclude Include="lhfont.h" />\r
+    <ClInclude Include="lhnet.h" />\r
+    <ClInclude Include="libcurl.h" />\r
+    <ClInclude Include="mathlib.h" />\r
+    <ClInclude Include="matrixlib.h" />\r
+    <ClInclude Include="mdfour.h" />\r
+    <ClInclude Include="menu.h" />\r
+    <ClInclude Include="meshqueue.h" />\r
+    <ClInclude Include="mod_skeletal_animatevertices_generic.h" />\r
+    <ClInclude Include="mod_skeletal_animatevertices_sse.h" />\r
+    <ClInclude Include="model_alias.h" />\r
+    <ClInclude Include="model_brush.h" />\r
+    <ClInclude Include="model_dpmodel.h" />\r
+    <ClInclude Include="model_iqm.h" />\r
+    <ClInclude Include="model_psk.h" />\r
+    <ClInclude Include="model_shared.h" />\r
+    <ClInclude Include="model_sprite.h" />\r
+    <ClInclude Include="model_zymotic.h" />\r
+    <ClInclude Include="modelgen.h" />\r
+    <ClInclude Include="mprogdefs.h" />\r
+    <ClInclude Include="netconn.h" />\r
+    <ClInclude Include="palette.h" />\r
+    <ClInclude Include="polygon.h" />\r
+    <ClInclude Include="portals.h" />\r
+    <ClInclude Include="pr_comp.h" />\r
+    <ClInclude Include="progdefs.h" />\r
+    <ClInclude Include="progs.h" />\r
+    <ClInclude Include="progsvm.h" />\r
+    <ClInclude Include="protocol.h" />\r
+    <ClInclude Include="prvm_cmds.h" />\r
+    <ClInclude Include="prvm_execprogram.h" />\r
+    <ClInclude Include="qtypes.h" />\r
+    <ClInclude Include="quakedef.h" />\r
+    <ClInclude Include="r_lerpanim.h" />\r
+    <ClInclude Include="r_modules.h" />\r
+    <ClInclude Include="r_shadow.h" />\r
+    <ClInclude Include="r_textures.h" />\r
+    <ClInclude Include="render.h" />\r
+    <ClInclude Include="resource.h" />\r
+    <ClInclude Include="sbar.h" />\r
+    <ClInclude Include="screen.h" />\r
+    <ClInclude Include="SDLMain.h" />\r
+    <ClInclude Include="server.h" />\r
+    <ClInclude Include="shader_glsl.h" />\r
+    <ClInclude Include="shader_hlsl.h" />\r
+    <ClInclude Include="snd_main.h" />\r
+    <ClInclude Include="snd_ogg.h" />\r
+    <ClInclude Include="snd_wav.h" />\r
+    <ClInclude Include="sound.h" />\r
+    <ClInclude Include="spritegn.h" />\r
+    <ClInclude Include="sv_demo.h" />\r
+    <ClInclude Include="svbsp.h" />\r
+    <ClInclude Include="sys.h" />\r
+    <ClInclude Include="thread.h" />\r
+    <ClInclude Include="timing.h" />\r
+    <ClInclude Include="utf8lib.h" />\r
+    <ClInclude Include="vid.h" />\r
+    <ClInclude Include="wad.h" />\r
+    <ClInclude Include="world.h" />\r
+    <ClInclude Include="zone.h" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file

diff --git a/darkplaces-sdl2-vs2012.vcxproj b/darkplaces-sdl2-vs2012.vcxproj
new file mode 100644 (file)
index 0000000..9a49ba3
--- /dev/null
+++ b/darkplaces-sdl2-vs2012.vcxproj
@@ -0,0 +1,383 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|Win32">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Debug|x64">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|Win32">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|x64">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}</ProjectGuid>\r
+    <RootNamespace>darkplacessdl2</RootNamespace>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <ProjectName>darkplaces-sdl2-vs2012</ProjectName>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <PlatformToolset>v110</PlatformToolset>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <PlatformToolset>v110</PlatformToolset>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <PlatformToolset>v110</PlatformToolset>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <PlatformToolset>v110</PlatformToolset>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+    <Import Project="vs2012_sdl2_win32.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+    <Import Project="vs2012_sdl2_win32.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+    <Import Project="vs2012_sdl2_win64.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+    <Import Project="vs2012_sdl2_win64.props" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup>\r
+    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <OutDir>$(SolutionDir))\</OutDir>\r
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>\r
+    <LinkIncremental>true</LinkIncremental>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
+    <OutDir>$(SolutionDir)\</OutDir>\r
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>\r
+    <LinkIncremental>true</LinkIncremental>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <OutDir>$(SolutionDir)\</OutDir>\r
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>\r
+    <LinkIncremental>false</LinkIncremental>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
+    <OutDir>$(SolutionDir)\</OutDir>\r
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>\r
+    <LinkIncremental>false</LinkIncremental>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <ClCompile>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>CONFIG_MENU;CONFIG_CD;WIN32;_DEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <MinimalRebuild>true</MinimalRebuild>\r
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
+      <PrecompiledHeader />\r
+      <WarningLevel>Level4</WarningLevel>\r
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
+      <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
+    </ClCompile>\r
+    <Link>\r
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>\r
+      <IgnoreSpecificDefaultLibraries>msvcrt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <SubSystem>Windows</SubSystem>\r
+      <TargetMachine>MachineX86</TargetMachine>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
+    <Midl>\r
+      <TargetEnvironment>X64</TargetEnvironment>\r
+    </Midl>\r
+    <ClCompile>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>CONFIG_MENU;CONFIG_CD;WIN32;WIN64;_DEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <MinimalRebuild>true</MinimalRebuild>\r
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
+      <PrecompiledHeader />\r
+      <WarningLevel>Level4</WarningLevel>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
+    </ClCompile>\r
+    <Link>\r
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>\r
+      <IgnoreSpecificDefaultLibraries>msvcrt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <SubSystem>Windows</SubSystem>\r
+      <TargetMachine>MachineX64</TargetMachine>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <ClCompile>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <IntrinsicFunctions>true</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>CONFIG_MENU;CONFIG_CD;WIN32;NDEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <PrecompiledHeader />\r
+      <WarningLevel>Level4</WarningLevel>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
+    </ClCompile>\r
+    <Link>\r
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <SubSystem>Windows</SubSystem>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <TargetMachine>MachineX86</TargetMachine>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
+    <Midl>\r
+      <TargetEnvironment>X64</TargetEnvironment>\r
+    </Midl>\r
+    <ClCompile>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <IntrinsicFunctions>true</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>CONFIG_MENU;CONFIG_CD;WIN32;WIN64;NDEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <PrecompiledHeader />\r
+      <WarningLevel>Level4</WarningLevel>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
+    </ClCompile>\r
+    <Link>\r
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <SubSystem>Windows</SubSystem>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <TargetMachine>MachineX64</TargetMachine>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="bih.c" />\r
+    <ClCompile Include="builddate.c" />\r
+    <ClCompile Include="cap_avi.c" />\r
+    <ClCompile Include="cap_ogg.c" />\r
+    <ClCompile Include="cd_sdl.c" />\r
+    <ClCompile Include="cd_shared.c" />\r
+    <ClCompile Include="cl_collision.c" />\r
+    <ClCompile Include="cl_demo.c" />\r
+    <ClCompile Include="cl_dyntexture.c" />\r
+    <ClCompile Include="cl_input.c" />\r
+    <ClCompile Include="cl_main.c" />\r
+    <ClCompile Include="cl_parse.c" />\r
+    <ClCompile Include="cl_particles.c" />\r
+    <ClCompile Include="cl_screen.c" />\r
+    <ClCompile Include="cl_video.c" />\r
+    <ClCompile Include="clvm_cmds.c" />\r
+    <ClCompile Include="cmd.c" />\r
+    <ClCompile Include="collision.c" />\r
+    <ClCompile Include="common.c" />\r
+    <ClCompile Include="console.c" />\r
+    <ClCompile Include="crypto.c" />\r
+    <ClCompile Include="csprogs.c" />\r
+    <ClCompile Include="curves.c" />\r
+    <ClCompile Include="cvar.c" />\r
+    <ClCompile Include="dpsoftrast.c" />\r
+    <ClCompile Include="dpvsimpledecode.c" />\r
+    <ClCompile Include="filematch.c" />\r
+    <ClCompile Include="fractalnoise.c" />\r
+    <ClCompile Include="fs.c" />\r
+    <ClCompile Include="ft2.c" />\r
+    <ClCompile Include="gl_backend.c" />\r
+    <ClCompile Include="gl_draw.c" />\r
+    <ClCompile Include="gl_rmain.c" />\r
+    <ClCompile Include="gl_rsurf.c" />\r
+    <ClCompile Include="gl_textures.c" />\r
+    <ClCompile Include="hmac.c" />\r
+    <ClCompile Include="host.c" />\r
+    <ClCompile Include="host_cmd.c" />\r
+    <ClCompile Include="image.c" />\r
+    <ClCompile Include="image_png.c" />\r
+    <ClCompile Include="jpeg.c" />\r
+    <ClCompile Include="keys.c" />\r
+    <ClCompile Include="lhnet.c" />\r
+    <ClCompile Include="libcurl.c" />\r
+    <ClCompile Include="mathlib.c" />\r
+    <ClCompile Include="matrixlib.c" />\r
+    <ClCompile Include="mdfour.c" />\r
+    <ClCompile Include="menu.c" />\r
+    <ClCompile Include="meshqueue.c" />\r
+    <ClCompile Include="mod_skeletal_animatevertices_generic.c" />\r
+    <ClCompile Include="mod_skeletal_animatevertices_sse.c" />\r
+    <ClCompile Include="model_alias.c" />\r
+    <ClCompile Include="model_brush.c" />\r
+    <ClCompile Include="model_shared.c" />\r
+    <ClCompile Include="model_sprite.c" />\r
+    <ClCompile Include="mvm_cmds.c" />\r
+    <ClCompile Include="netconn.c" />\r
+    <ClCompile Include="palette.c" />\r
+    <ClCompile Include="polygon.c" />\r
+    <ClCompile Include="portals.c" />\r
+    <ClCompile Include="protocol.c" />\r
+    <ClCompile Include="prvm_cmds.c" />\r
+    <ClCompile Include="prvm_edict.c" />\r
+    <ClCompile Include="prvm_exec.c" />\r
+    <ClCompile Include="r_explosion.c" />\r
+    <ClCompile Include="r_lightning.c" />\r
+    <ClCompile Include="r_modules.c" />\r
+    <ClCompile Include="r_shadow.c" />\r
+    <ClCompile Include="r_sky.c" />\r
+    <ClCompile Include="r_sprites.c" />\r
+    <ClCompile Include="sbar.c" />\r
+    <ClCompile Include="snd_main.c" />\r
+    <ClCompile Include="snd_mem.c" />\r
+    <ClCompile Include="snd_mix.c" />\r
+    <ClCompile Include="snd_ogg.c" />\r
+    <ClCompile Include="snd_sdl.c" />\r
+    <ClCompile Include="snd_wav.c" />\r
+    <ClCompile Include="sv_demo.c" />\r
+    <ClCompile Include="sv_main.c" />\r
+    <ClCompile Include="sv_move.c" />\r
+    <ClCompile Include="sv_phys.c" />\r
+    <ClCompile Include="sv_user.c" />\r
+    <ClCompile Include="svbsp.c" />\r
+    <ClCompile Include="svvm_cmds.c" />\r
+    <ClCompile Include="sys_sdl.c" />\r
+    <ClCompile Include="sys_shared.c" />\r
+    <ClCompile Include="thread_sdl.c" />\r
+    <ClCompile Include="utf8lib.c" />\r
+    <ClCompile Include="vid_sdl.c" />\r
+    <ClCompile Include="vid_shared.c" />\r
+    <ClCompile Include="view.c" />\r
+    <ClCompile Include="wad.c" />\r
+    <ClCompile Include="world.c" />\r
+    <ClCompile Include="zone.c" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="bih.h" />\r
+    <ClInclude Include="bspfile.h" />\r
+    <ClInclude Include="cap_avi.h" />\r
+    <ClInclude Include="cap_ogg.h" />\r
+    <ClInclude Include="cdaudio.h" />\r
+    <ClInclude Include="cl_collision.h" />\r
+    <ClInclude Include="cl_dyntexture.h" />\r
+    <ClInclude Include="cl_gecko.h" />\r
+    <ClInclude Include="cl_screen.h" />\r
+    <ClInclude Include="cl_video.h" />\r
+    <ClInclude Include="client.h" />\r
+    <ClInclude Include="clprogdefs.h" />\r
+    <ClInclude Include="clvm_cmds.h" />\r
+    <ClInclude Include="cmd.h" />\r
+    <ClInclude Include="collision.h" />\r
+    <ClInclude Include="common.h" />\r
+    <ClInclude Include="console.h" />\r
+    <ClInclude Include="crypto.h" />\r
+    <ClInclude Include="csprogs.h" />\r
+    <ClInclude Include="curves.h" />\r
+    <ClInclude Include="cvar.h" />\r
+    <ClInclude Include="dpsoftrast.h" />\r
+    <ClInclude Include="dpvsimpledecode.h" />\r
+    <ClInclude Include="draw.h" />\r
+    <ClInclude Include="fs.h" />\r
+    <ClInclude Include="ft2.h" />\r
+    <ClInclude Include="ft2_defs.h" />\r
+    <ClInclude Include="ft2_fontdefs.h" />\r
+    <ClInclude Include="gl_backend.h" />\r
+    <ClInclude Include="glquake.h" />\r
+    <ClInclude Include="hmac.h" />\r
+    <ClInclude Include="image.h" />\r
+    <ClInclude Include="image_png.h" />\r
+    <ClInclude Include="input.h" />\r
+    <ClInclude Include="intoverflow.h" />\r
+    <ClInclude Include="jpeg.h" />\r
+    <ClInclude Include="keys.h" />\r
+    <ClInclude Include="lhfont.h" />\r
+    <ClInclude Include="lhnet.h" />\r
+    <ClInclude Include="libcurl.h" />\r
+    <ClInclude Include="mathlib.h" />\r
+    <ClInclude Include="matrixlib.h" />\r
+    <ClInclude Include="mdfour.h" />\r
+    <ClInclude Include="menu.h" />\r
+    <ClInclude Include="meshqueue.h" />\r
+    <ClInclude Include="mod_skeletal_animatevertices_generic.h" />\r
+    <ClInclude Include="mod_skeletal_animatevertices_sse.h" />\r
+    <ClInclude Include="model_alias.h" />\r
+    <ClInclude Include="model_brush.h" />\r
+    <ClInclude Include="model_dpmodel.h" />\r
+    <ClInclude Include="model_iqm.h" />\r
+    <ClInclude Include="model_psk.h" />\r
+    <ClInclude Include="model_shared.h" />\r
+    <ClInclude Include="model_sprite.h" />\r
+    <ClInclude Include="model_zymotic.h" />\r
+    <ClInclude Include="modelgen.h" />\r
+    <ClInclude Include="mprogdefs.h" />\r
+    <ClInclude Include="netconn.h" />\r
+    <ClInclude Include="palette.h" />\r
+    <ClInclude Include="polygon.h" />\r
+    <ClInclude Include="portals.h" />\r
+    <ClInclude Include="pr_comp.h" />\r
+    <ClInclude Include="progdefs.h" />\r
+    <ClInclude Include="progs.h" />\r
+    <ClInclude Include="progsvm.h" />\r
+    <ClInclude Include="protocol.h" />\r
+    <ClInclude Include="prvm_cmds.h" />\r
+    <ClInclude Include="prvm_execprogram.h" />\r
+    <ClInclude Include="qtypes.h" />\r
+    <ClInclude Include="quakedef.h" />\r
+    <ClInclude Include="r_lerpanim.h" />\r
+    <ClInclude Include="r_modules.h" />\r
+    <ClInclude Include="r_shadow.h" />\r
+    <ClInclude Include="r_textures.h" />\r
+    <ClInclude Include="render.h" />\r
+    <ClInclude Include="resource.h" />\r
+    <ClInclude Include="sbar.h" />\r
+    <ClInclude Include="screen.h" />\r
+    <ClInclude Include="SDLMain.h" />\r
+    <ClInclude Include="server.h" />\r
+    <ClInclude Include="shader_glsl.h" />\r
+    <ClInclude Include="shader_hlsl.h" />\r
+    <ClInclude Include="snd_main.h" />\r
+    <ClInclude Include="snd_ogg.h" />\r
+    <ClInclude Include="snd_wav.h" />\r
+    <ClInclude Include="sound.h" />\r
+    <ClInclude Include="spritegn.h" />\r
+    <ClInclude Include="sv_demo.h" />\r
+    <ClInclude Include="svbsp.h" />\r
+    <ClInclude Include="sys.h" />\r
+    <ClInclude Include="thread.h" />\r
+    <ClInclude Include="timing.h" />\r
+    <ClInclude Include="utf8lib.h" />\r
+    <ClInclude Include="vid.h" />\r
+    <ClInclude Include="wad.h" />\r
+    <ClInclude Include="world.h" />\r
+    <ClInclude Include="zone.h" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file

diff --git a/darkplaces-sdl2-vs2013.vcxproj b/darkplaces-sdl2-vs2013.vcxproj
new file mode 100644 (file)
index 0000000..51c67eb
--- /dev/null
+++ b/darkplaces-sdl2-vs2013.vcxproj
@@ -0,0 +1,392 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|Win32">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Debug|x64">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|Win32">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|x64">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{72D93E63-FDBB-4AA3-B42B-FAADA6D7F5B2}</ProjectGuid>\r
+    <RootNamespace>darkplacessdl2</RootNamespace>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <ProjectName>darkplaces-sdl2-vs2013</ProjectName>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <PlatformToolset>v120</PlatformToolset>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+    <Import Project="vs2012_sdl2_win32.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+    <Import Project="vs2012_sdl2_win32.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+    <Import Project="vs2012_sdl2_win64.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+    <Import Project="vs2012_sdl2_win64.props" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup>\r
+    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <OutDir>$(SolutionDir))\</OutDir>\r
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>\r
+    <LinkIncremental>true</LinkIncremental>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
+    <OutDir>$(SolutionDir)\</OutDir>\r
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>\r
+    <LinkIncremental>true</LinkIncremental>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <OutDir>$(SolutionDir)\</OutDir>\r
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>\r
+    <LinkIncremental>false</LinkIncremental>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
+    <OutDir>$(SolutionDir)\</OutDir>\r
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>\r
+    <LinkIncremental>false</LinkIncremental>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <ClCompile>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>CONFIG_MENU;CONFIG_CD;WIN32;_DEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <MinimalRebuild>true</MinimalRebuild>\r
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
+      <PrecompiledHeader />\r
+      <WarningLevel>Level4</WarningLevel>\r
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
+      <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
+      <AdditionalOptions>/wd"4201" %(AdditionalOptions)</AdditionalOptions>\r
+    </ClCompile>\r
+    <Link>\r
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>\r
+      <IgnoreSpecificDefaultLibraries>msvcrt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <SubSystem>Windows</SubSystem>\r
+      <TargetMachine>MachineX86</TargetMachine>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
+    <Midl>\r
+      <TargetEnvironment>X64</TargetEnvironment>\r
+    </Midl>\r
+    <ClCompile>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>CONFIG_MENU;CONFIG_CD;WIN32;WIN64;_DEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <MinimalRebuild>true</MinimalRebuild>\r
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
+      <PrecompiledHeader />\r
+      <WarningLevel>Level4</WarningLevel>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
+      <AdditionalOptions>/wd"4201" %(AdditionalOptions)</AdditionalOptions>\r
+    </ClCompile>\r
+    <Link>\r
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>\r
+      <IgnoreSpecificDefaultLibraries>msvcrt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <SubSystem>Windows</SubSystem>\r
+      <TargetMachine>MachineX64</TargetMachine>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <ClCompile>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <IntrinsicFunctions>true</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>CONFIG_MENU;CONFIG_CD;WIN32;NDEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <PrecompiledHeader />\r
+      <WarningLevel>Level4</WarningLevel>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
+      <AdditionalOptions>/wd"4201" %(AdditionalOptions)</AdditionalOptions>\r
+    </ClCompile>\r
+    <Link>\r
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <SubSystem>Windows</SubSystem>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <TargetMachine>MachineX86</TargetMachine>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
+    <Midl>\r
+      <TargetEnvironment>X64</TargetEnvironment>\r
+    </Midl>\r
+    <ClCompile>\r
+      <Optimization>MaxSpeed</Optimization>\r
+      <IntrinsicFunctions>true</IntrinsicFunctions>\r
+      <PreprocessorDefinitions>CONFIG_MENU;CONFIG_CD;WIN32;WIN64;NDEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <PrecompiledHeader />\r
+      <WarningLevel>Level4</WarningLevel>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
+      <AdditionalOptions>/wd"4201" %(AdditionalOptions)</AdditionalOptions>\r
+    </ClCompile>\r
+    <Link>\r
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <SubSystem>Windows</SubSystem>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <TargetMachine>MachineX64</TargetMachine>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="bih.c" />\r
+    <ClCompile Include="builddate.c" />\r
+    <ClCompile Include="cap_avi.c" />\r
+    <ClCompile Include="cap_ogg.c" />\r
+    <ClCompile Include="cd_sdl.c" />\r
+    <ClCompile Include="cd_shared.c" />\r
+    <ClCompile Include="cl_collision.c" />\r
+    <ClCompile Include="cl_demo.c" />\r
+    <ClCompile Include="cl_dyntexture.c" />\r
+    <ClCompile Include="cl_input.c" />\r
+    <ClCompile Include="cl_main.c" />\r
+    <ClCompile Include="cl_parse.c" />\r
+    <ClCompile Include="cl_particles.c" />\r
+    <ClCompile Include="cl_screen.c" />\r
+    <ClCompile Include="cl_video.c" />\r
+    <ClCompile Include="clvm_cmds.c" />\r
+    <ClCompile Include="cmd.c" />\r
+    <ClCompile Include="collision.c" />\r
+    <ClCompile Include="common.c" />\r
+    <ClCompile Include="console.c" />\r
+    <ClCompile Include="crypto.c">\r
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/wd"4800" %(AdditionalOptions)</AdditionalOptions>\r
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">/wd"4800" %(AdditionalOptions)</AdditionalOptions>\r
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/wd"4800" %(AdditionalOptions)</AdditionalOptions>\r
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/wd"4800" %(AdditionalOptions)</AdditionalOptions>\r
+    </ClCompile>\r
+    <ClCompile Include="csprogs.c" />\r
+    <ClCompile Include="curves.c" />\r
+    <ClCompile Include="cvar.c" />\r
+    <ClCompile Include="dpsoftrast.c" />\r
+    <ClCompile Include="dpvsimpledecode.c" />\r
+    <ClCompile Include="filematch.c" />\r
+    <ClCompile Include="fractalnoise.c" />\r
+    <ClCompile Include="fs.c" />\r
+    <ClCompile Include="ft2.c" />\r
+    <ClCompile Include="gl_backend.c" />\r
+    <ClCompile Include="gl_draw.c" />\r
+    <ClCompile Include="gl_rmain.c" />\r
+    <ClCompile Include="gl_rsurf.c" />\r
+    <ClCompile Include="gl_textures.c" />\r
+    <ClCompile Include="hmac.c" />\r
+    <ClCompile Include="host.c" />\r
+    <ClCompile Include="host_cmd.c" />\r
+    <ClCompile Include="image.c" />\r
+    <ClCompile Include="image_png.c" />\r
+    <ClCompile Include="jpeg.c" />\r
+    <ClCompile Include="keys.c" />\r
+    <ClCompile Include="lhnet.c" />\r
+    <ClCompile Include="libcurl.c" />\r
+    <ClCompile Include="mathlib.c" />\r
+    <ClCompile Include="matrixlib.c" />\r
+    <ClCompile Include="mdfour.c" />\r
+    <ClCompile Include="menu.c" />\r
+    <ClCompile Include="meshqueue.c" />\r
+    <ClCompile Include="mod_skeletal_animatevertices_generic.c" />\r
+    <ClCompile Include="mod_skeletal_animatevertices_sse.c" />\r
+    <ClCompile Include="model_alias.c" />\r
+    <ClCompile Include="model_brush.c" />\r
+    <ClCompile Include="model_shared.c" />\r
+    <ClCompile Include="model_sprite.c" />\r
+    <ClCompile Include="mvm_cmds.c" />\r
+    <ClCompile Include="netconn.c" />\r
+    <ClCompile Include="palette.c" />\r
+    <ClCompile Include="polygon.c" />\r
+    <ClCompile Include="portals.c" />\r
+    <ClCompile Include="protocol.c" />\r
+    <ClCompile Include="prvm_cmds.c" />\r
+    <ClCompile Include="prvm_edict.c" />\r
+    <ClCompile Include="prvm_exec.c" />\r
+    <ClCompile Include="r_explosion.c" />\r
+    <ClCompile Include="r_lightning.c" />\r
+    <ClCompile Include="r_modules.c" />\r
+    <ClCompile Include="r_shadow.c" />\r
+    <ClCompile Include="r_sky.c" />\r
+    <ClCompile Include="r_sprites.c" />\r
+    <ClCompile Include="sbar.c" />\r
+    <ClCompile Include="snd_main.c" />\r
+    <ClCompile Include="snd_mem.c" />\r
+    <ClCompile Include="snd_mix.c" />\r
+    <ClCompile Include="snd_ogg.c" />\r
+    <ClCompile Include="snd_sdl.c" />\r
+    <ClCompile Include="snd_wav.c" />\r
+    <ClCompile Include="sv_demo.c" />\r
+    <ClCompile Include="sv_main.c" />\r
+    <ClCompile Include="sv_move.c" />\r
+    <ClCompile Include="sv_phys.c" />\r
+    <ClCompile Include="sv_user.c" />\r
+    <ClCompile Include="svbsp.c" />\r
+    <ClCompile Include="svvm_cmds.c" />\r
+    <ClCompile Include="sys_sdl.c" />\r
+    <ClCompile Include="sys_shared.c" />\r
+    <ClCompile Include="thread_sdl.c" />\r
+    <ClCompile Include="utf8lib.c" />\r
+    <ClCompile Include="vid_sdl.c" />\r
+    <ClCompile Include="vid_shared.c" />\r
+    <ClCompile Include="view.c" />\r
+    <ClCompile Include="wad.c" />\r
+    <ClCompile Include="world.c" />\r
+    <ClCompile Include="zone.c" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="bih.h" />\r
+    <ClInclude Include="bspfile.h" />\r
+    <ClInclude Include="cap_avi.h" />\r
+    <ClInclude Include="cap_ogg.h" />\r
+    <ClInclude Include="cdaudio.h" />\r
+    <ClInclude Include="cl_collision.h" />\r
+    <ClInclude Include="cl_dyntexture.h" />\r
+    <ClInclude Include="cl_gecko.h" />\r
+    <ClInclude Include="cl_screen.h" />\r
+    <ClInclude Include="cl_video.h" />\r
+    <ClInclude Include="client.h" />\r
+    <ClInclude Include="clprogdefs.h" />\r
+    <ClInclude Include="clvm_cmds.h" />\r
+    <ClInclude Include="cmd.h" />\r
+    <ClInclude Include="collision.h" />\r
+    <ClInclude Include="common.h" />\r
+    <ClInclude Include="console.h" />\r
+    <ClInclude Include="crypto.h" />\r
+    <ClInclude Include="csprogs.h" />\r
+    <ClInclude Include="curves.h" />\r
+    <ClInclude Include="cvar.h" />\r
+    <ClInclude Include="dpsoftrast.h" />\r
+    <ClInclude Include="dpvsimpledecode.h" />\r
+    <ClInclude Include="draw.h" />\r
+    <ClInclude Include="fs.h" />\r
+    <ClInclude Include="ft2.h" />\r
+    <ClInclude Include="ft2_defs.h" />\r
+    <ClInclude Include="ft2_fontdefs.h" />\r
+    <ClInclude Include="gl_backend.h" />\r
+    <ClInclude Include="glquake.h" />\r
+    <ClInclude Include="hmac.h" />\r
+    <ClInclude Include="image.h" />\r
+    <ClInclude Include="image_png.h" />\r
+    <ClInclude Include="input.h" />\r
+    <ClInclude Include="intoverflow.h" />\r
+    <ClInclude Include="jpeg.h" />\r
+    <ClInclude Include="keys.h" />\r
+    <ClInclude Include="lhfont.h" />\r
+    <ClInclude Include="lhnet.h" />\r
+    <ClInclude Include="libcurl.h" />\r
+    <ClInclude Include="mathlib.h" />\r
+    <ClInclude Include="matrixlib.h" />\r
+    <ClInclude Include="mdfour.h" />\r
+    <ClInclude Include="menu.h" />\r
+    <ClInclude Include="meshqueue.h" />\r
+    <ClInclude Include="mod_skeletal_animatevertices_generic.h" />\r
+    <ClInclude Include="mod_skeletal_animatevertices_sse.h" />\r
+    <ClInclude Include="model_alias.h" />\r
+    <ClInclude Include="model_brush.h" />\r
+    <ClInclude Include="model_dpmodel.h" />\r
+    <ClInclude Include="model_iqm.h" />\r
+    <ClInclude Include="model_psk.h" />\r
+    <ClInclude Include="model_shared.h" />\r
+    <ClInclude Include="model_sprite.h" />\r
+    <ClInclude Include="model_zymotic.h" />\r
+    <ClInclude Include="modelgen.h" />\r
+    <ClInclude Include="mprogdefs.h" />\r
+    <ClInclude Include="netconn.h" />\r
+    <ClInclude Include="palette.h" />\r
+    <ClInclude Include="polygon.h" />\r
+    <ClInclude Include="portals.h" />\r
+    <ClInclude Include="pr_comp.h" />\r
+    <ClInclude Include="progdefs.h" />\r
+    <ClInclude Include="progs.h" />\r
+    <ClInclude Include="progsvm.h" />\r
+    <ClInclude Include="protocol.h" />\r
+    <ClInclude Include="prvm_cmds.h" />\r
+    <ClInclude Include="prvm_execprogram.h" />\r
+    <ClInclude Include="qtypes.h" />\r
+    <ClInclude Include="quakedef.h" />\r
+    <ClInclude Include="r_lerpanim.h" />\r
+    <ClInclude Include="r_modules.h" />\r
+    <ClInclude Include="r_shadow.h" />\r
+    <ClInclude Include="r_textures.h" />\r
+    <ClInclude Include="render.h" />\r
+    <ClInclude Include="resource.h" />\r
+    <ClInclude Include="sbar.h" />\r
+    <ClInclude Include="screen.h" />\r
+    <ClInclude Include="SDLMain.h" />\r
+    <ClInclude Include="server.h" />\r
+    <ClInclude Include="shader_glsl.h" />\r
+    <ClInclude Include="shader_hlsl.h" />\r
+    <ClInclude Include="snd_main.h" />\r
+    <ClInclude Include="snd_ogg.h" />\r
+    <ClInclude Include="snd_wav.h" />\r
+    <ClInclude Include="sound.h" />\r
+    <ClInclude Include="spritegn.h" />\r
+    <ClInclude Include="sv_demo.h" />\r
+    <ClInclude Include="svbsp.h" />\r
+    <ClInclude Include="sys.h" />\r
+    <ClInclude Include="thread.h" />\r
+    <ClInclude Include="timing.h" />\r
+    <ClInclude Include="utf8lib.h" />\r
+    <ClInclude Include="vid.h" />\r
+    <ClInclude Include="wad.h" />\r
+    <ClInclude Include="world.h" />\r
+    <ClInclude Include="zone.h" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file

diff --git a/darkplaces-vs2010.sln b/darkplaces-vs2010.sln
index 0febc775bbdbc309ab7ea5ae2b647215d7eafea8..b97ef0fdad11dc701fbd3e1daaeff98c5a018e77 100644 (file)
--- a/darkplaces-vs2010.sln
+++ b/darkplaces-vs2010.sln
@@ -1,11 +1,13 @@
 \r
 Microsoft Visual Studio Solution File, Format Version 11.00\r
 # Visual C++ Express 2010\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-wgl", "darkplaces-wgl-vs2010.vcxproj", "{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-wgl-vs2010", "darkplaces-wgl-vs2010.vcxproj", "{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}"\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-sdl", "darkplaces-sdl-vs2010.vcxproj", "{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-sdl-vs2010", "darkplaces-sdl-vs2010.vcxproj", "{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}"\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-dedicated", "darkplaces-dedicated-vs2010.vcxproj", "{389AE334-D907-4069-90B3-F0551B3EFDE9}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-dedicated-vs2010", "darkplaces-dedicated-vs2010.vcxproj", "{389AE334-D907-4069-90B3-F0551B3EFDE9}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-sdl2-vs2010", "darkplaces-sdl2-vs2010.vcxproj", "{72D93E63-FDBB-4AA3-B42B-FAADA6D7F5B2}"\r
 EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r

diff --git a/darkplaces-vs2012.sln b/darkplaces-vs2012.sln
index 18d8c1c7849a556024e6d767653a4525ba9d2703..8d4aa6bc656123d937670bccd99eef2dcbc29d9b 100644 (file)
--- a/darkplaces-vs2012.sln
+++ b/darkplaces-vs2012.sln
@@ -1,11 +1,13 @@
 \r
 Microsoft Visual Studio Solution File, Format Version 12.00\r
 # Visual Studio Express 2012 for Windows Desktop\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-wgl", "darkplaces-wgl-vs2012.vcxproj", "{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-wgl-vs2012", "darkplaces-wgl-vs2012.vcxproj", "{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}"\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-sdl", "darkplaces-sdl-vs2012.vcxproj", "{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-sdl-vs2012", "darkplaces-sdl-vs2012.vcxproj", "{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}"\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-dedicated", "darkplaces-dedicated-vs2012.vcxproj", "{389AE334-D907-4069-90B3-F0551B3EFDE9}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-dedicated-vs2012", "darkplaces-dedicated-vs2012.vcxproj", "{389AE334-D907-4069-90B3-F0551B3EFDE9}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-sdl2-vs2012", "darkplaces-sdl2-vs2012.vcxproj", "{72D93E63-FDBB-4AA3-B42B-FAADA6D7F5B2}"\r
 EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r

diff --git a/darkplaces-vs2013.sln b/darkplaces-vs2013.sln
index ed2481d5193fa305ea2f9f5bae30febacd5455a0..5e8dfc58e3e894fa93cd7d1b053ea93ae5d544c5 100644 (file)
--- a/darkplaces-vs2013.sln
+++ b/darkplaces-vs2013.sln
@@ -1,11 +1,15 @@
 \r
 Microsoft Visual Studio Solution File, Format Version 12.00\r
-# Visual Studio Express 2012 for Windows Desktop\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-wgl", "darkplaces-wgl-vs2013.vcxproj", "{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}"\r
+# Visual Studio 2013\r
+VisualStudioVersion = 12.0.31101.0\r
+MinimumVisualStudioVersion = 10.0.40219.1\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-wgl-vs2013", "darkplaces-wgl-vs2013.vcxproj", "{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}"\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-sdl", "darkplaces-sdl-vs2013.vcxproj", "{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-sdl-vs2013", "darkplaces-sdl-vs2013.vcxproj", "{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}"\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-dedicated", "darkplaces-dedicated-vs2013.vcxproj", "{389AE334-D907-4069-90B3-F0551B3EFDE9}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-dedicated-vs2013", "darkplaces-dedicated-vs2013.vcxproj", "{389AE334-D907-4069-90B3-F0551B3EFDE9}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-sdl2-vs2013", "darkplaces-sdl2-vs2013.vcxproj", "{72D93E63-FDBB-4AA3-B42B-FAADA6D7F5B2}"\r
 EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
@@ -39,6 +43,14 @@ Global
                {389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|Win32.Build.0 = Release|Win32\r
                {389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|x64.ActiveCfg = Release|x64\r
                {389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|x64.Build.0 = Release|x64\r
+               {72D93E63-FDBB-4AA3-B42B-FAADA6D7F5B2}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {72D93E63-FDBB-4AA3-B42B-FAADA6D7F5B2}.Debug|Win32.Build.0 = Debug|Win32\r
+               {72D93E63-FDBB-4AA3-B42B-FAADA6D7F5B2}.Debug|x64.ActiveCfg = Debug|x64\r
+               {72D93E63-FDBB-4AA3-B42B-FAADA6D7F5B2}.Debug|x64.Build.0 = Debug|x64\r
+               {72D93E63-FDBB-4AA3-B42B-FAADA6D7F5B2}.Release|Win32.ActiveCfg = Release|Win32\r
+               {72D93E63-FDBB-4AA3-B42B-FAADA6D7F5B2}.Release|Win32.Build.0 = Release|Win32\r
+               {72D93E63-FDBB-4AA3-B42B-FAADA6D7F5B2}.Release|x64.ActiveCfg = Release|x64\r
+               {72D93E63-FDBB-4AA3-B42B-FAADA6D7F5B2}.Release|x64.Build.0 = Release|x64\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r

diff --git a/darkplaces-wgl-vs2010.vcxproj b/darkplaces-wgl-vs2010.vcxproj
index 3515e8045aaf520c45866cd9f8a7ca396e93c681..2daad8b0bfeea1fa16fcfffc113c82aebbb03084 100644 (file)
--- a/darkplaces-wgl-vs2010.vcxproj
+++ b/darkplaces-wgl-vs2010.vcxproj
@@ -39,11 +39,11 @@
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)-$(ProjectName)\</OutDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)-$(ProjectName)\</IntDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\</OutDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)-$(ProjectName)\</OutDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)-$(ProjectName)\</IntDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\</OutDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>\r
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)</TargetName>\r
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)</TargetName>\r
@@ -78,7 +78,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
-      <WarningLevel>Level3</WarningLevel>\r
+      <WarningLevel>Level4</WarningLevel>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <CompileAs>CompileAsCpp</CompileAs>\r
       <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;4201;4611;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r

diff --git a/darkplaces-wgl-vs2012.vcxproj b/darkplaces-wgl-vs2012.vcxproj
index f9ad5fb4e622845db82c4f349d5339786e04502d..c35763cef74a49af030465be36abf6eca64eb8a3 100644 (file)
--- a/darkplaces-wgl-vs2012.vcxproj
+++ b/darkplaces-wgl-vs2012.vcxproj
@@ -71,23 +71,23 @@
     <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
-    <OutDir>$(SolutionDir)$(Configuration)-$(ProjectName)\</OutDir>\r
-    <IntDir>$(Configuration)-$(ProjectName)\</IntDir>\r
+    <OutDir>$(SolutionDir))\</OutDir>\r
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>\r
     <LinkIncremental>true</LinkIncremental>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>\r
+    <OutDir>$(SolutionDir)\</OutDir>\r
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>\r
     <LinkIncremental>true</LinkIncremental>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <OutDir>$(SolutionDir)\</OutDir>\r
-    <IntDir>$(Configuration)-$(ProjectName)\</IntDir>\r
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>\r
     <LinkIncremental>false</LinkIncremental>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>\r
+    <OutDir>$(SolutionDir)\</OutDir>\r
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>\r
     <LinkIncremental>false</LinkIncremental>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r

diff --git a/darkplaces-wgl-vs2013.vcxproj b/darkplaces-wgl-vs2013.vcxproj
index de618afb2f728fed836f70f3b379b19155a0a7da..9018649057ca3ceb212edf1a8edea8a981be62d9 100644 (file)
--- a/darkplaces-wgl-vs2013.vcxproj
+++ b/darkplaces-wgl-vs2013.vcxproj
@@ -71,23 +71,23 @@
     <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
-    <OutDir>$(SolutionDir)$(Configuration)-$(ProjectName)\</OutDir>\r
-    <IntDir>$(Configuration)-$(ProjectName)\</IntDir>\r
+    <OutDir>$(SolutionDir))\</OutDir>\r
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>\r
     <LinkIncremental>true</LinkIncremental>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>\r
+    <OutDir>$(SolutionDir)\</OutDir>\r
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>\r
     <LinkIncremental>true</LinkIncremental>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <OutDir>$(SolutionDir)\</OutDir>\r
-    <IntDir>$(Configuration)-$(ProjectName)\</IntDir>\r
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>\r
     <LinkIncremental>false</LinkIncremental>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>\r
+    <OutDir>$(SolutionDir)\</OutDir>\r
+    <IntDir>$(Configuration)-$(ProjectName)-$(Platform)\</IntDir>\r
     <LinkIncremental>false</LinkIncremental>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r

diff --git a/sys_sdl.c b/sys_sdl.c
index 228c0a49f627449efa432e3567cb996d9cfbb48a..7bfb041f6c7345cf919d649cfbe3eb0a4b374bc3 100644 (file)
--- 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 e3c934a7adac167d2e208bc99650f645e43f38d5..03af6eaf0bf2e5e8a19dd269f21111a95bc13ce8 100644 (file)
--- 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 (file)
index 0000000..0ca4653
--- /dev/null
+++ b/vs2010_sdl2_win32.props
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ImportGroup Label="PropertySheets" />\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup>\r
+    <IncludePath>C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Include;C:\dev\SDL2-2.0\include;$(IncludePath)</IncludePath>\r
+  </PropertyGroup>\r
+  <PropertyGroup>\r
+    <LibraryPath>C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x86;C:\dev\SDL2-2.0\lib\x86;$(LibraryPath)</LibraryPath>\r
+    <_PropertySheetDisplayName>vs2010_win32</_PropertySheetDisplayName>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup />\r
+  <ItemGroup />\r
+</Project>
\ No newline at end of file

diff --git a/vs2010_sdl2_win64.props b/vs2010_sdl2_win64.props
new file mode 100644 (file)
index 0000000..9539eb5
--- /dev/null
+++ b/vs2010_sdl2_win64.props
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ImportGroup Label="PropertySheets" />\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup>\r
+    <IncludePath>C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Include;C:\dev\SDL2-2.0\include;$(IncludePath)</IncludePath>\r
+  </PropertyGroup>\r
+  <PropertyGroup>\r
+    <LibraryPath>C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x64;C:\dev\SDL2-2.0\lib\x64;$(LibraryPath)</LibraryPath>\r
+    <_PropertySheetDisplayName>vs2010_win64</_PropertySheetDisplayName>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup />\r
+  <ItemGroup />\r
+</Project>
\ No newline at end of file

diff --git a/vs2012_sdl2_win32.props b/vs2012_sdl2_win32.props
new file mode 100644 (file)
index 0000000..e5fa2c1
--- /dev/null
+++ b/vs2012_sdl2_win32.props
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ImportGroup Label="PropertySheets" />\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup>\r
+    <IncludePath>C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Include;C:\dev\SDL2-2.0\include;$(IncludePath)</IncludePath>\r
+  </PropertyGroup>\r
+  <PropertyGroup>\r
+    <LibraryPath>C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x86;C:\dev\SDL2-2.0\lib\x86;$(LibraryPath)</LibraryPath>\r
+    <_PropertySheetDisplayName>vs2012_win32</_PropertySheetDisplayName>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup />\r
+  <ItemGroup />\r
+</Project>
\ No newline at end of file

diff --git a/vs2012_sdl2_win64.props b/vs2012_sdl2_win64.props
new file mode 100644 (file)
index 0000000..cfe1b95
--- /dev/null
+++ b/vs2012_sdl2_win64.props
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ImportGroup Label="PropertySheets" />\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup>\r
+    <IncludePath>C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Include;C:\dev\SDL2-2.0\include;$(IncludePath)</IncludePath>\r
+  </PropertyGroup>\r
+  <PropertyGroup>\r
+    <LibraryPath>C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x64;C:\dev\SDL2-2.0\lib\x64;$(LibraryPath)</LibraryPath>\r
+    <_PropertySheetDisplayName>vs2012_win64</_PropertySheetDisplayName>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup />\r
+  <ItemGroup />\r
+</Project>
\ No newline at end of file