From 58cc3efa7ff9580d7e92ee8601b63291a66e1889 Mon Sep 17 00:00:00 2001
From: Connor McLaughlin <stenzek@gmail.com>
Date: Wed, 10 Aug 2022 13:25:03 +1000
Subject: [PATCH] vsprops: Simplify conditions

---
 dep/msvc/vsprops/Base.props           | 33 ++++++++-------------------
 dep/msvc/vsprops/Configurations.props |  6 ++---
 dep/msvc/vsprops/Toolkit.props        |  4 ++--
 3 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/dep/msvc/vsprops/Base.props b/dep/msvc/vsprops/Base.props
index b43e5326f..c7203b153 100644
--- a/dep/msvc/vsprops/Base.props
+++ b/dep/msvc/vsprops/Base.props
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
+  <PropertyGroup Condition="$(Configuration.Contains(Debug))">
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='DebugFast'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Release'">
+  <PropertyGroup Condition="!$(Configuration.Contains(Debug))">
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='ReleaseLTCG'">
-    <LinkIncremental>false</LinkIncremental>
+  <PropertyGroup Condition="$(Configuration.Contains(LTCG))">
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
 
@@ -31,14 +27,14 @@
   </ItemDefinitionGroup>
 
   <!-- Disable exceptions when not building for UWP. -->
-  <ItemDefinitionGroup Condition="'$(BuildingForUWP)'!='true'">
+  <ItemDefinitionGroup Condition="!$(Configuration.Contains(UWP))">
     <ClCompile>
       <PreprocessorDefinitions>_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>false</ExceptionHandling>
     </ClCompile>
   </ItemDefinitionGroup>
 
-  <ItemDefinitionGroup Condition="'$(BuildingForUWP)'=='true'">
+  <ItemDefinitionGroup Condition="$(Configuration.Contains(UWP))">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <AdditionalIncludeDirectories></AdditionalIncludeDirectories>
@@ -46,22 +42,21 @@
     </ClCompile>
   </ItemDefinitionGroup>
 
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug' Or '$(Configuration)'=='DebugUWP'">
+  <ItemDefinitionGroup Condition="$(Configuration.Contains(Debug))">
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='DebugFast'">
+  <ItemDefinitionGroup Condition="$(Configuration.Contains(DebugFast))">
     <ClCompile>
-      <Optimization>Disabled</Optimization>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <SupportJustMyCode>false</SupportJustMyCode>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>_DEBUGFAST;_DEBUG;_ITERATOR_DEBUG_LEVEL=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUGFAST;_ITERATOR_DEBUG_LEVEL=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
+  <ItemDefinitionGroup Condition="!$(Configuration.Contains(Debug))">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
@@ -75,20 +70,12 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='ReleaseLTCG' Or '$(Configuration)'=='ReleaseUWP'">
+  <ItemDefinitionGroup Condition="$(Configuration.Contains(LTCG))">
     <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WholeProgramOptimization>true</WholeProgramOptimization>
       <OmitFramePointers>true</OmitFramePointers>
-      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
       <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
     </Link>
   </ItemDefinitionGroup>
diff --git a/dep/msvc/vsprops/Configurations.props b/dep/msvc/vsprops/Configurations.props
index f05c5447d..68f20f35d 100644
--- a/dep/msvc/vsprops/Configurations.props
+++ b/dep/msvc/vsprops/Configurations.props
@@ -79,19 +79,19 @@
     <BuildingForUWP Condition="'$(Configuration)'=='DebugUWP' Or '$(Configuration)'=='ReleaseUWP'">true</BuildingForUWP>
   </PropertyGroup>
 
-  <Import Project="$(SolutionDir)packages\Microsoft.Windows.CppWinRT.2.0.210505.3\build\native\Microsoft.Windows.CppWinRT.props" Condition="('$(Configuration)'=='DebugUWP' Or '$(Configuration)'=='ReleaseUWP') And Exists('$(SolutionDir)packages\Microsoft.Windows.CppWinRT.2.0.210505.3\build\native\Microsoft.Windows.CppWinRT.props')" />
+  <Import Project="$(SolutionDir)packages\Microsoft.Windows.CppWinRT.2.0.210505.3\build\native\Microsoft.Windows.CppWinRT.props" Condition="$(Configuration.Contains(UWP)) And Exists('$(SolutionDir)packages\Microsoft.Windows.CppWinRT.2.0.210505.3\build\native\Microsoft.Windows.CppWinRT.props')" />
 
   <PropertyGroup Label="Globals">
     <ProjectName>$(MSBuildProjectName)</ProjectName>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
   </PropertyGroup>
 
-  <PropertyGroup Label="Globals" Condition="'$(BuildingForUWP)'!='true'">
+  <PropertyGroup Label="Globals" Condition="!$(Configuration.Contains(UWP))">
     <Keyword>Win32Proj</Keyword>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   
-  <PropertyGroup Label="Globals" Condition="'$(BuildingForUWP)'=='true'">
+  <PropertyGroup Label="Globals" Condition="$(Configuration.Contains(UWP))">
     <MinimalCoreWin>true</MinimalCoreWin>
     <DefaultLanguage>en-US</DefaultLanguage>
     <MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
diff --git a/dep/msvc/vsprops/Toolkit.props b/dep/msvc/vsprops/Toolkit.props
index 87e497b06..7f8c475b1 100644
--- a/dep/msvc/vsprops/Toolkit.props
+++ b/dep/msvc/vsprops/Toolkit.props
@@ -6,10 +6,10 @@
     <SpectreMitigation>false</SpectreMitigation>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)'=='Debug' Or '$(Configuration)'=='DebugFast' Or '$(Configuration)'=='DebugUWP'">
+  <PropertyGroup Condition="$(Configuration.Contains(Debug))">
     <UseDebugLibraries>true</UseDebugLibraries>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Release' Or '$(Configuration)'=='ReleaseLTCG' Or '$(Configuration)'=='ReleaseUWP'">
+  <PropertyGroup Condition="!$(Configuration.Contains(Debug))">
     <UseDebugLibraries>false</UseDebugLibraries>
   </PropertyGroup>
 </Project>