]> de.git.xonotic.org Git - xonotic/darkplaces.git/commitdiff
projects / xonotic / darkplaces.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 40c5033)
added props files for vs2010 and vs2012, changed name of darkplaces-2010.sln to darkp...
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Thu, 7 Feb 2013 14:22:17 +0000 (14:22 +0000)
committerhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Thu, 7 Feb 2013 14:22:17 +0000 (14:22 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11895 d7cf8633-e32d-0410-b094-e92efae38249

13 files changed:
darkplaces-2010.sln [deleted file] patch | blob | history
darkplaces-dedicated-vs2012.vcxproj patch | blob | history
darkplaces-dedicated.vcxproj [deleted file] patch | blob | history
darkplaces-sdl-vs2012.vcxproj patch | blob | history
darkplaces-sdl.vcxproj [deleted file] patch | blob | history
darkplaces-vs2010.sln [new file with mode: 0644] patch | blob
darkplaces-vs2012.sln patch | blob | history
darkplaces-wgl-vs2012.vcxproj patch | blob | history
darkplaces-wgl.vcxproj [deleted file] patch | blob | history
vs2010_win32.props [new file with mode: 0644] patch | blob
vs2010_win64.props [new file with mode: 0644] patch | blob
vs2012_win32.props [new file with mode: 0644] patch | blob
vs2012_win64.props [new file with mode: 0644] patch | blob

diff --git a/darkplaces-2010.sln b/darkplaces-2010.sln
deleted file mode 100644 (file)
index 94a7722..0000000
--- a/darkplaces-2010.sln
+++ /dev/null
@@ -1,46 +0,0 @@
-\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.vcxproj", "{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}"\r
-EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-sdl", "darkplaces-sdl.vcxproj", "{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}"\r
-EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-dedicated", "darkplaces-dedicated.vcxproj", "{389AE334-D907-4069-90B3-F0551B3EFDE9}"\r
-EndProject\r
-Global\r
-       GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
-               Debug|Win32 = Debug|Win32\r
-               Debug|x64 = Debug|x64\r
-               Release|Win32 = Release|Win32\r
-               Release|x64 = Release|x64\r
-       EndGlobalSection\r
-       GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
-               {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Debug|Win32.Build.0 = Debug|Win32\r
-               {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Debug|x64.ActiveCfg = Debug|Win32\r
-               {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Debug|x64.Build.0 = Debug|Win32\r
-               {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Release|Win32.ActiveCfg = Release|Win32\r
-               {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Release|Win32.Build.0 = Release|Win32\r
-               {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Release|x64.ActiveCfg = Release|Win32\r
-               {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Release|x64.Build.0 = Release|Win32\r
-               {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Debug|Win32.Build.0 = Debug|Win32\r
-               {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Debug|x64.ActiveCfg = Debug|Win32\r
-               {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Debug|x64.Build.0 = Debug|Win32\r
-               {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Release|Win32.ActiveCfg = Release|Win32\r
-               {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Release|Win32.Build.0 = Release|Win32\r
-               {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Release|x64.ActiveCfg = Release|Win32\r
-               {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Release|x64.Build.0 = Release|Win32\r
-               {389AE334-D907-4069-90B3-F0551B3EFDE9}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {389AE334-D907-4069-90B3-F0551B3EFDE9}.Debug|Win32.Build.0 = Debug|Win32\r
-               {389AE334-D907-4069-90B3-F0551B3EFDE9}.Debug|x64.ActiveCfg = Debug|Win32\r
-               {389AE334-D907-4069-90B3-F0551B3EFDE9}.Debug|x64.Build.0 = Debug|Win32\r
-               {389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|Win32.ActiveCfg = Release|Win32\r
-               {389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|Win32.Build.0 = Release|Win32\r
-               {389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|x64.ActiveCfg = Release|Win32\r
-               {389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|x64.Build.0 = Release|Win32\r
-       EndGlobalSection\r
-       GlobalSection(SolutionProperties) = preSolution\r
-               HideSolutionNode = FALSE\r
-       EndGlobalSection\r
-EndGlobal\r
diff --git a/darkplaces-dedicated-vs2012.vcxproj b/darkplaces-dedicated-vs2012.vcxproj
index dfab0b9cac15e7d7316144f86c1f202d05630b99..a8688b3d764f9487f95e433e2b6d2b875cb88525 100644 (file)
--- a/darkplaces-dedicated-vs2012.vcxproj
+++ b/darkplaces-dedicated-vs2012.vcxproj
@@ -5,51 +5,90 @@
       <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>{389AE334-D907-4069-90B3-F0551B3EFDE9}</ProjectGuid>\r
     <RootNamespace>darkplacesdedicated</RootNamespace>\r
     <Keyword>Win32Proj</Keyword>\r
-    <ProjectName>darkplaces-dedicated-2012</ProjectName>\r
+    <ProjectName>darkplaces-dedicated-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
-    <PlatformToolset>v110</PlatformToolset>\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="..\..\Users\havoc\Documents\msdev-settings\lordhavoc_vs2010_win32.props" />\r
+    <Import Project="vs2012_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="..\..\Users\havoc\Documents\msdev-settings\lordhavoc_vs2010_win32.props" />\r
+    <Import Project="vs2012_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_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_win64.props" />\r
   </ImportGroup>\r
   <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
-    <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
-    <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
+    <_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
+    <LinkIncremental>true</LinkIncremental>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>\r
+    <LinkIncremental>true</LinkIncremental>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <OutDir>$(SolutionDir)$(Configuration)-$(ProjectName)\</OutDir>\r
+    <IntDir>$(Configuration)-$(ProjectName)\</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
+    <LinkIncremental>false</LinkIncremental>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r
@@ -58,8 +97,7 @@
       <MinimalRebuild>true</MinimalRebuild>\r
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
-      <PrecompiledHeader>\r
-      </PrecompiledHeader>\r
+      <PrecompiledHeader />\r
       <WarningLevel>Level3</WarningLevel>\r
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
       <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
@@ -71,6 +109,28 @@
       <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>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>Level3</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>Console</SubSystem>\r
+      <TargetMachine>MachineX64</TargetMachine>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <ClCompile>\r
       <Optimization>MaxSpeed</Optimization>\r
@@ -78,13 +138,13 @@
       <PreprocessorDefinitions>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
+      <PrecompiledHeader />\r
       <WarningLevel>Level3</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>Console</SubSystem>\r
       <OptimizeReferences>true</OptimizeReferences>\r
@@ -92,6 +152,30 @@
       <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>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>Level3</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>Console</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
diff --git a/darkplaces-dedicated.vcxproj b/darkplaces-dedicated.vcxproj
deleted file mode 100644 (file)
index 79bc9ab..0000000
--- a/darkplaces-dedicated.vcxproj
+++ /dev/null
@@ -1,285 +0,0 @@
-<?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>{389AE334-D907-4069-90B3-F0551B3EFDE9}</ProjectGuid>\r
-    <RootNamespace>darkplacesdedicated</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="..\..\Users\havoc\Documents\msdev-settings\lordhavoc_vs2010_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="..\..\Users\havoc\Documents\msdev-settings\lordhavoc_vs2010_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)$(Configuration)-$(ProjectName)\</OutDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)-$(ProjectName)\</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
-    <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>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>Level3</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
-      <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <SubSystem>Console</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>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>Level3</WarningLevel>\r
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
-      <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
-    </ClCompile>\r
-    <Link>\r
-      <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <SubSystem>Console</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_null.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_null.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_linux.c" />\r
-    <ClCompile Include="sys_shared.c" />\r
-    <ClCompile Include="thread_null.c" />\r
-    <ClCompile Include="utf8lib.c" />\r
-    <ClCompile Include="vid_null.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="server.h" />\r
-    <ClInclude Include="shader_glsl.h" />\r
-    <ClInclude Include="shader_hlsl.h" />\r
-    <ClInclude Include="snd_main.h" />\r
-    <ClInclude Include="snd_modplug.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-sdl-vs2012.vcxproj b/darkplaces-sdl-vs2012.vcxproj
index cdc33f26486b654ffd21cd2de7737fd4b68a74a0..5f16c7d1045b8e9fd6222eeff58e9470bc5b9292 100644 (file)
--- a/darkplaces-sdl-vs2012.vcxproj
+++ b/darkplaces-sdl-vs2012.vcxproj
@@ -5,10 +5,18 @@
       <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
@@ -19,37 +27,68 @@
   <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
-    <PlatformToolset>v110</PlatformToolset>\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="..\..\Users\havoc\Documents\msdev-settings\lordhavoc_vs2010_win32.props" />\r
+    <Import Project="vs2012_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="..\..\Users\havoc\Documents\msdev-settings\lordhavoc_vs2010_win32.props" />\r
+    <Import Project="vs2012_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_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_win64.props" />\r
   </ImportGroup>\r
   <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
-    <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
-    <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
+    <_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
+    <LinkIncremental>true</LinkIncremental>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>\r
+    <LinkIncremental>true</LinkIncremental>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <OutDir>$(SolutionDir)$(Configuration)-$(ProjectName)\</OutDir>\r
+    <IntDir>$(Configuration)-$(ProjectName)\</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
+    <LinkIncremental>false</LinkIncremental>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r
@@ -58,8 +97,7 @@
       <MinimalRebuild>true</MinimalRebuild>\r
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
-      <PrecompiledHeader>\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
@@ -72,6 +110,29 @@
       <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>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
+    </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
@@ -79,8 +140,7 @@
       <PreprocessorDefinitions>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
+      <PrecompiledHeader />\r
       <WarningLevel>Level4</WarningLevel>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
@@ -94,6 +154,30 @@
       <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>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
+    </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
diff --git a/darkplaces-sdl.vcxproj b/darkplaces-sdl.vcxproj
deleted file mode 100644 (file)
index c6ea128..0000000
--- a/darkplaces-sdl.vcxproj
+++ /dev/null
@@ -1,294 +0,0 @@
-<?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>darkplacessdl</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="..\..\Users\havoc\Documents\msdev-settings\lordhavoc_vs2010_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="..\..\Users\havoc\Documents\msdev-settings\lordhavoc_vs2010_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)$(Configuration)-$(ProjectName)\</OutDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)-$(ProjectName)\</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
-    <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>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>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_modplug.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_modplug.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
new file mode 100644 (file)
index 0000000..0febc77
--- /dev/null
+++ b/darkplaces-vs2010.sln
@@ -0,0 +1,46 @@
+\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
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-sdl", "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
+EndProject\r
+Global\r
+       GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
+               Debug|Win32 = Debug|Win32\r
+               Debug|x64 = Debug|x64\r
+               Release|Win32 = Release|Win32\r
+               Release|x64 = Release|x64\r
+       EndGlobalSection\r
+       GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
+               {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Debug|Win32.Build.0 = Debug|Win32\r
+               {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Debug|x64.ActiveCfg = Debug|Win32\r
+               {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Debug|x64.Build.0 = Debug|Win32\r
+               {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Release|Win32.ActiveCfg = Release|Win32\r
+               {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Release|Win32.Build.0 = Release|Win32\r
+               {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Release|x64.ActiveCfg = Release|Win32\r
+               {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Release|x64.Build.0 = Release|Win32\r
+               {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Debug|Win32.Build.0 = Debug|Win32\r
+               {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Debug|x64.ActiveCfg = Debug|Win32\r
+               {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Debug|x64.Build.0 = Debug|Win32\r
+               {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Release|Win32.ActiveCfg = Release|Win32\r
+               {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Release|Win32.Build.0 = Release|Win32\r
+               {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Release|x64.ActiveCfg = Release|Win32\r
+               {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Release|x64.Build.0 = Release|Win32\r
+               {389AE334-D907-4069-90B3-F0551B3EFDE9}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {389AE334-D907-4069-90B3-F0551B3EFDE9}.Debug|Win32.Build.0 = Debug|Win32\r
+               {389AE334-D907-4069-90B3-F0551B3EFDE9}.Debug|x64.ActiveCfg = Debug|Win32\r
+               {389AE334-D907-4069-90B3-F0551B3EFDE9}.Debug|x64.Build.0 = Debug|Win32\r
+               {389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|Win32.ActiveCfg = Release|Win32\r
+               {389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|Win32.Build.0 = Release|Win32\r
+               {389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|x64.ActiveCfg = Release|Win32\r
+               {389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|x64.Build.0 = Release|Win32\r
+       EndGlobalSection\r
+       GlobalSection(SolutionProperties) = preSolution\r
+               HideSolutionNode = FALSE\r
+       EndGlobalSection\r
+EndGlobal\r
diff --git a/darkplaces-vs2012.sln b/darkplaces-vs2012.sln
index c355d0e046fea2efc8c550ed9308aa2feff76f00..18d8c1c7849a556024e6d767653a4525ba9d2703 100644 (file)
--- a/darkplaces-vs2012.sln
+++ b/darkplaces-vs2012.sln
@@ -1,6 +1,6 @@
 \r
-Microsoft Visual Studio Solution File, Format Version 11.00\r
-# Visual C++ Express 2010\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
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "darkplaces-sdl", "darkplaces-sdl-vs2012.vcxproj", "{7470C8B3-FCA7-42D3-9909-5F9E735C7C51}"\r
@@ -17,28 +17,28 @@ Global
        GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
                {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Debug|Win32.Build.0 = Debug|Win32\r
-               {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Debug|x64.ActiveCfg = Debug|Win32\r
-               {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Debug|x64.Build.0 = Debug|Win32\r
+               {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Debug|x64.ActiveCfg = Debug|x64\r
+               {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Debug|x64.Build.0 = Debug|x64\r
                {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Release|Win32.ActiveCfg = Release|Win32\r
                {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Release|Win32.Build.0 = Release|Win32\r
-               {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Release|x64.ActiveCfg = Release|Win32\r
-               {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Release|x64.Build.0 = Release|Win32\r
+               {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Release|x64.ActiveCfg = Release|x64\r
+               {6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}.Release|x64.Build.0 = Release|x64\r
                {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Debug|Win32.Build.0 = Debug|Win32\r
-               {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Debug|x64.ActiveCfg = Debug|Win32\r
-               {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Debug|x64.Build.0 = Debug|Win32\r
+               {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Debug|x64.ActiveCfg = Debug|x64\r
+               {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Debug|x64.Build.0 = Debug|x64\r
                {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Release|Win32.ActiveCfg = Release|Win32\r
                {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Release|Win32.Build.0 = Release|Win32\r
-               {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Release|x64.ActiveCfg = Release|Win32\r
-               {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Release|x64.Build.0 = Release|Win32\r
+               {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Release|x64.ActiveCfg = Release|x64\r
+               {7470C8B3-FCA7-42D3-9909-5F9E735C7C51}.Release|x64.Build.0 = Release|x64\r
                {389AE334-D907-4069-90B3-F0551B3EFDE9}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {389AE334-D907-4069-90B3-F0551B3EFDE9}.Debug|Win32.Build.0 = Debug|Win32\r
-               {389AE334-D907-4069-90B3-F0551B3EFDE9}.Debug|x64.ActiveCfg = Debug|Win32\r
-               {389AE334-D907-4069-90B3-F0551B3EFDE9}.Debug|x64.Build.0 = Debug|Win32\r
+               {389AE334-D907-4069-90B3-F0551B3EFDE9}.Debug|x64.ActiveCfg = Debug|x64\r
+               {389AE334-D907-4069-90B3-F0551B3EFDE9}.Debug|x64.Build.0 = Debug|x64\r
                {389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|Win32.ActiveCfg = Release|Win32\r
                {389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|Win32.Build.0 = Release|Win32\r
-               {389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|x64.ActiveCfg = Release|Win32\r
-               {389AE334-D907-4069-90B3-F0551B3EFDE9}.Release|x64.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
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r
diff --git a/darkplaces-wgl-vs2012.vcxproj b/darkplaces-wgl-vs2012.vcxproj
index af25042cbf3ca788ce5eaa9de7931672858d0f49..297de1213396c5224a55f3d0ef2539f9eb90515e 100644 (file)
--- a/darkplaces-wgl-vs2012.vcxproj
+++ b/darkplaces-wgl-vs2012.vcxproj
@@ -5,10 +5,18 @@
       <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>{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}</ProjectGuid>\r
@@ -19,37 +27,68 @@
   <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
-    <PlatformToolset>v110</PlatformToolset>\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="..\..\Users\havoc\Documents\msdev-settings\lordhavoc_vs2010_win32.props" />\r
+    <Import Project="vs2012_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="..\..\Users\havoc\Documents\msdev-settings\lordhavoc_vs2010_win32.props" />\r
+    <Import Project="vs2012_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_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_win64.props" />\r
   </ImportGroup>\r
   <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
-    <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
-    <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
+    <_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
+    <LinkIncremental>true</LinkIncremental>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>\r
+    <LinkIncremental>true</LinkIncremental>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <OutDir>$(SolutionDir)$(Configuration)-$(ProjectName)\</OutDir>\r
+    <IntDir>$(Configuration)-$(ProjectName)\</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
+    <LinkIncremental>false</LinkIncremental>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r
@@ -58,8 +97,7 @@
       <MinimalRebuild>true</MinimalRebuild>\r
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
-      <PrecompiledHeader>\r
-      </PrecompiledHeader>\r
+      <PrecompiledHeader />\r
       <WarningLevel>Level4</WarningLevel>\r
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
       <CompileAs>CompileAsCpp</CompileAs>\r
@@ -72,6 +110,29 @@
       <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>WIN32;WIN64;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;SUPPORTDIRECTX;SUPPORTD3D;_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
+      <CompileAs>CompileAsCpp</CompileAs>\r
+      <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;4201;4611;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+    </ClCompile>\r
+    <Link>\r
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>\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
@@ -79,8 +140,7 @@
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;SUPPORTDIRECTX;SUPPORTD3D;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
-      <PrecompiledHeader>\r
-      </PrecompiledHeader>\r
+      <PrecompiledHeader />\r
       <WarningLevel>Level3</WarningLevel>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <CompileAs>CompileAsCpp</CompileAs>\r
@@ -95,6 +155,31 @@
       <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>WIN32;WIN64;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;SUPPORTDIRECTX;SUPPORTD3D;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <PrecompiledHeader />\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <CompileAs>CompileAsCpp</CompileAs>\r
+      <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;4201;4611;%(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>MachineX64</TargetMachine>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
   <ItemGroup>\r
     <ClCompile Include="bih.c" />\r
     <ClCompile Include="builddate.c" />\r
diff --git a/darkplaces-wgl.vcxproj b/darkplaces-wgl.vcxproj
deleted file mode 100644 (file)
index 85d04b8..0000000
--- a/darkplaces-wgl.vcxproj
+++ /dev/null
@@ -1,298 +0,0 @@
-<?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>{6E3D4311-BB84-4EB7-8C6C-10AA3D249C28}</ProjectGuid>\r
-    <RootNamespace>darkplaceswgl</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="..\..\Users\havoc\Documents\msdev-settings\lordhavoc_vs2010_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="..\..\Users\havoc\Documents\msdev-settings\lordhavoc_vs2010_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)$(Configuration)-$(ProjectName)\</OutDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)-$(ProjectName)\</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
-    <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>WIN32;_DEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;SUPPORTDIRECTX;SUPPORTD3D;_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
-      <CompileAs>CompileAsCpp</CompileAs>\r
-      <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;4201;4611;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
-    </ClCompile>\r
-    <Link>\r
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>\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>WIN32;NDEBUG;_WINDOWS;WIN32_LEAN_AND_MEAN;SUPPORTDIRECTX;SUPPORTD3D;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
-      <FunctionLevelLinking>true</FunctionLevelLinking>\r
-      <PrecompiledHeader>\r
-      </PrecompiledHeader>\r
-      <WarningLevel>Level3</WarningLevel>\r
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
-      <CompileAs>CompileAsCpp</CompileAs>\r
-      <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;4201;4611;%(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_shared.c" />\r
-    <ClCompile Include="cd_win.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_modplug.c" />\r
-    <ClCompile Include="snd_ogg.c" />\r
-    <ClCompile Include="snd_wav.c" />\r
-    <ClCompile Include="snd_win.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_shared.c" />\r
-    <ClCompile Include="sys_win.c" />\r
-    <ClCompile Include="thread_win.c" />\r
-    <ClCompile Include="utf8lib.c" />\r
-    <ClCompile Include="vid_shared.c" />\r
-    <ClCompile Include="vid_wgl.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="conproc.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="server.h" />\r
-    <ClInclude Include="shader_glsl.h" />\r
-    <ClInclude Include="shader_hlsl.h" />\r
-    <ClInclude Include="snd_main.h" />\r
-    <ClInclude Include="snd_modplug.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
-  <ItemGroup>\r
-    <ResourceCompile Include="darkplaces.rc" />\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/vs2010_win32.props b/vs2010_win32.props
new file mode 100644 (file)
index 0000000..a5d1298
--- /dev/null
+++ b/vs2010_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\SDL-1.2\include;$(IncludePath)</IncludePath>\r
+  </PropertyGroup>\r
+  <PropertyGroup>\r
+    <LibraryPath>C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x86;C:\dev\SDL-1.2\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_win64.props b/vs2010_win64.props
new file mode 100644 (file)
index 0000000..4d7b1f2
--- /dev/null
+++ b/vs2010_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\SDL-1.2\include;$(IncludePath)</IncludePath>\r
+  </PropertyGroup>\r
+  <PropertyGroup>\r
+    <LibraryPath>C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x64;C:\dev\SDL-1.2\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_win32.props b/vs2012_win32.props
new file mode 100644 (file)
index 0000000..49427b6
--- /dev/null
+++ b/vs2012_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\SDL-1.2\include;$(IncludePath)</IncludePath>\r
+  </PropertyGroup>\r
+  <PropertyGroup>\r
+    <LibraryPath>C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x86;C:\dev\SDL-1.2\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_win64.props b/vs2012_win64.props
new file mode 100644 (file)
index 0000000..5dce216
--- /dev/null
+++ b/vs2012_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\SDL-1.2\include;$(IncludePath)</IncludePath>\r
+  </PropertyGroup>\r
+  <PropertyGroup>\r
+    <LibraryPath>C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x64;C:\dev\SDL-1.2\lib\x64;$(LibraryPath)</LibraryPath>\r
+    <_PropertySheetDisplayName>vs2012_win64</_PropertySheetDisplayName>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup />\r
+  <ItemGroup />\r
+</Project>
\ No newline at end of file