X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=darkplaces-sdl2-vs2019.vcxproj;h=4722fe3331d3f6977b86e891ab775a4916472482;hp=8b4658a74a634b6559b3299d83fbbdd7ff0eb132;hb=HEAD;hpb=20a31a160b9dbb9788b943d3284a26c873a62c3b

diff --git a/darkplaces-sdl2-vs2019.vcxproj b/darkplaces-sdl2-vs2019.vcxproj
index 8b4658a7..f94592a5 100644
--- a/darkplaces-sdl2-vs2019.vcxproj
+++ b/darkplaces-sdl2-vs2019.vcxproj
@@ -28,45 +28,29 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="vs2012_sdl2_win32.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="vs2012_sdl2_win32.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="vs2012_sdl2_win64.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="vs2012_sdl2_win64.props" />
-  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
@@ -104,6 +88,8 @@
       <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <AdditionalOptions>/wd"4201" %(AdditionalOptions)</AdditionalOptions>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard_C>stdc17</LanguageStandard_C>
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
@@ -122,7 +108,6 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>CONFIG_MENU;CONFIG_VIDEO_CAPTURE;WIN32;WIN64;_DEBUG;_WINDOWS;_FILE_OFFSET_BITS=64;__KERNEL_STRICT_NAMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader />
@@ -131,6 +116,8 @@
       <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <AdditionalOptions>/wd"4201" %(AdditionalOptions)</AdditionalOptions>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard_C>stdc17</LanguageStandard_C>
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
@@ -154,6 +141,8 @@
       <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <AdditionalOptions>/wd"4201" %(AdditionalOptions)</AdditionalOptions>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard_C>stdc17</LanguageStandard_C>
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
@@ -182,6 +171,8 @@
       <DisableSpecificWarnings>4706;4127;4100;4055;4054;4244;4305;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <AdditionalOptions>/wd"4201" %(AdditionalOptions)</AdditionalOptions>
+      <LanguageStandard_C>stdc17</LanguageStandard_C>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
@@ -199,32 +190,33 @@
     <ClCompile Include="cap_avi.c" />
     <ClCompile Include="cap_ogg.c" />
     <ClCompile Include="cd_shared.c" />
-  	<ClCompile Include="cl_cmd.c" />
+    <ClCompile Include="cl_cmd.c" />
     <ClCompile Include="cl_collision.c" />
     <ClCompile Include="cl_demo.c" />
-	<ClCompile Include="cl_ents.c" />
-	<ClCompile Include="cl_ents4.c" />
-	<ClCompile Include="cl_ents5.c" />
-	<ClCompile Include="cl_ents_nq.c" />
-	<ClCompile Include="cl_ents_qw.c" />
+    <ClCompile Include="cl_ents.c" />
+    <ClCompile Include="cl_ents4.c" />
+    <ClCompile Include="cl_ents5.c" />
+    <ClCompile Include="cl_ents_nq.c" />
+    <ClCompile Include="cl_ents_qw.c" />
     <ClCompile Include="cl_input.c" />
     <ClCompile Include="cl_main.c" />
     <ClCompile Include="cl_parse.c" />
     <ClCompile Include="cl_particles.c" />
     <ClCompile Include="cl_screen.c" />
     <ClCompile Include="cl_video.c" />
-	<ClCompile Include="cl_video_libavw.c" />
+    <ClCompile Include="cl_video_libavw.c" />
     <ClCompile Include="clvm_cmds.c" />
     <ClCompile Include="cmd.c" />
     <ClCompile Include="collision.c" />
-	<ClCompile Include="com_crc16.c" />
-	<ClCompile Include="com_ents.c" />
-	<ClCompile Include="com_ents4.c" />
-	<ClCompile Include="com_game.c" />
-	<ClCompile Include="com_list.c" />
-	<ClCompile Include="com_msg.c" />
+    <ClCompile Include="com_crc16.c" />
+    <ClCompile Include="com_ents.c" />
+    <ClCompile Include="com_ents4.c" />
+    <ClCompile Include="com_game.c" />
+    <ClCompile Include="com_infostring.c" />
+    <ClCompile Include="com_msg.c" />
     <ClCompile Include="common.c" />
     <ClCompile Include="console.c" />
+    <ClCompile Include="convex.c" />
     <ClCompile Include="crypto.c">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/wd"4800" %(AdditionalOptions)</AdditionalOptions>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">/wd"4800" %(AdditionalOptions)</AdditionalOptions>
@@ -265,6 +257,7 @@
     <ClCompile Include="model_sprite.c" />
     <ClCompile Include="mvm_cmds.c" />
     <ClCompile Include="netconn.c" />
+    <ClCompile Include="phys.c" />
     <ClCompile Include="palette.c" />
     <ClCompile Include="polygon.c" />
     <ClCompile Include="portals.c" />
@@ -276,6 +269,7 @@
     <ClCompile Include="r_lightning.c" />
     <ClCompile Include="r_modules.c" />
     <ClCompile Include="r_shadow.c" />
+    <ClCompile Include="r_stats.c" />
     <ClCompile Include="r_sky.c" />
     <ClCompile Include="r_sprites.c" />
     <ClCompile Include="sbar.c" />
@@ -285,14 +279,14 @@
     <ClCompile Include="snd_ogg.c" />
     <ClCompile Include="snd_sdl.c" />
     <ClCompile Include="snd_wav.c" />
-	<ClCompile Include="snd_xmp.c" />
+    <ClCompile Include="snd_xmp.c" />
     <ClCompile Include="sv_ccmds.c" />
     <ClCompile Include="sv_demo.c" />
-	<ClCompile Include="sv_ents.c" />
-	<ClCompile Include="sv_ents4.c" />
-	<ClCompile Include="sv_ents5.c" />
-	<ClCompile Include="sv_ents_nq.c" />
-	<ClCompile Include="sv_ents_csqc.c" />
+    <ClCompile Include="sv_ents.c" />
+    <ClCompile Include="sv_ents4.c" />
+    <ClCompile Include="sv_ents5.c" />
+    <ClCompile Include="sv_ents_nq.c" />
+    <ClCompile Include="sv_ents_csqc.c" />
     <ClCompile Include="sv_main.c" />
     <ClCompile Include="sv_move.c" />
     <ClCompile Include="sv_phys.c" />
@@ -322,8 +316,8 @@
     <ClInclude Include="cdaudio.h" />
     <ClInclude Include="cl_collision.h" />
     <ClInclude Include="cl_gecko.h" />
-	<ClInclude Include="cl_parse.h" />
-	<ClInclude Include="cl_particles.h" />
+    <ClInclude Include="cl_parse.h" />
+    <ClInclude Include="cl_particles.h" />
     <ClInclude Include="cl_screen.h" />
     <ClInclude Include="cl_video.h" />
     <ClInclude Include="cl_video_libavw.h" />
@@ -332,7 +326,9 @@
     <ClInclude Include="clvm_cmds.h" />
     <ClInclude Include="cmd.h" />
     <ClInclude Include="collision.h" />
-	<ClInclude Include="com_list.h" />
+    <ClInclude Include="com_game.h" />
+    <ClInclude Include="com_infostring.h" />
+    <ClInclude Include="com_list.h" />
     <ClInclude Include="common.h" />
     <ClInclude Include="console.h" />
     <ClInclude Include="crypto.h" />
@@ -342,6 +338,7 @@
     <ClInclude Include="darkplaces.h" />
     <ClInclude Include="dpvsimpledecode.h" />
     <ClInclude Include="draw.h" />
+    <ClInclude Include="filematch.h" />
     <ClInclude Include="fs.h" />
     <ClInclude Include="ft2.h" />
     <ClInclude Include="ft2_defs.h" />
@@ -353,7 +350,6 @@
     <ClInclude Include="image.h" />
     <ClInclude Include="image_png.h" />
     <ClInclude Include="input.h" />
-    <ClInclude Include="intoverflow.h" />
     <ClInclude Include="jpeg.h" />
     <ClInclude Include="keys.h" />
     <ClInclude Include="lhfont.h" />
@@ -371,13 +367,19 @@
     <ClInclude Include="model_dpmodel.h" />
     <ClInclude Include="model_iqm.h" />
     <ClInclude Include="model_psk.h" />
+    <ClInclude Include="model_q1bsp.h" />
+    <ClInclude Include="model_q2bsp.h" />
+    <ClInclude Include="model_q3bsp.h" />
+    <ClInclude Include="model_vbsp.h" />
     <ClInclude Include="model_shared.h" />
     <ClInclude Include="model_sprite.h" />
     <ClInclude Include="model_zymotic.h" />
     <ClInclude Include="modelgen.h" />
     <ClInclude Include="mprogdefs.h" />
     <ClInclude Include="netconn.h" />
+    <ClInclude Include="phys.h" />
     <ClInclude Include="palette.h" />
+    <ClInclude Include="pmove.h" />
     <ClInclude Include="polygon.h" />
     <ClInclude Include="portals.h" />
     <ClInclude Include="prvm_offsets.h" />
@@ -394,19 +396,21 @@
     <ClInclude Include="quakedef.h" />
     <ClInclude Include="r_lerpanim.h" />
     <ClInclude Include="r_modules.h" />
+    <ClInclude Include="r_qshader.h" />
     <ClInclude Include="r_shadow.h" />
+    <ClInclude Include="r_stats.h" />
     <ClInclude Include="r_textures.h" />
     <ClInclude Include="render.h" />
     <ClInclude Include="resource.h" />
     <ClInclude Include="sbar.h" />
     <ClInclude Include="screen.h" />
-    <ClInclude Include="SDLMain.h" />
+    <ClInclude Include="SDL.h" />
     <ClInclude Include="server.h" />
     <ClInclude Include="shader_glsl.h" />
     <ClInclude Include="snd_main.h" />
     <ClInclude Include="snd_ogg.h" />
     <ClInclude Include="snd_wav.h" />
-	<ClInclude Include="snd_xmp.h" />
+    <ClInclude Include="snd_xmp.h" />
     <ClInclude Include="sound.h" />
     <ClInclude Include="spritegn.h" />
     <ClInclude Include="sv_demo.h" />
@@ -418,6 +422,7 @@
     <ClInclude Include="utf8lib.h" />
     <ClInclude Include="vid.h" />
     <ClInclude Include="view.h" />
+    <ClInclude Include="convex.h" />
     <ClInclude Include="wad.h" />
     <ClInclude Include="world.h" />
     <ClInclude Include="zone.h" />
@@ -425,7 +430,19 @@
   <ItemGroup>
     <ResourceCompile Include="darkplaces.rc" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
+    <Import Project="packages\sdl2.nuget.redist.2.30.2\build\native\sdl2.nuget.redist.targets" Condition="Exists('packages\sdl2.nuget.redist.2.30.2\build\native\sdl2.nuget.redist.targets')" />
+    <Import Project="packages\sdl2.nuget.2.30.2\build\native\sdl2.nuget.targets" Condition="Exists('packages\sdl2.nuget.2.30.2\build\native\sdl2.nuget.targets')" />
   </ImportGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('packages\sdl2.nuget.redist.2.30.2\build\native\sdl2.nuget.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\sdl2.nuget.redist.2.30.2\build\native\sdl2.nuget.redist.targets'))" />
+    <Error Condition="!Exists('packages\sdl2.nuget.2.30.2\build\native\sdl2.nuget.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\sdl2.nuget.2.30.2\build\native\sdl2.nuget.targets'))" />
+  </Target>
 </Project>
\ No newline at end of file