From 32c30ad9e4ea7f07308ef97351d0f41c7f760390 Mon Sep 17 00:00:00 2001
From: kojin <kojin@protonmail.com>
Date: Mon, 28 Jun 2021 16:30:07 -0400
Subject: [PATCH] vs: split target names for avx and avx2 builds

---
 common/vsprops/common.props | 8 ++++++++
 pcsx2/pcsx2.vcxproj         | 5 ++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/common/vsprops/common.props b/common/vsprops/common.props
index 241941026f..6045aa785a 100644
--- a/common/vsprops/common.props
+++ b/common/vsprops/common.props
@@ -5,6 +5,14 @@
     <SvnRootDir>$(ProjectRootDir)\..</SvnRootDir>
     <SvnCommonDir>$(SvnRootDir)\common</SvnCommonDir>
     <PcsxSubsection />
+    <SSEString />
+    <SSEString Condition="$(Configuration.Contains(AVX2))">-avx2</SSEString>
+    <ArchString />
+    <ArchString Condition="'$(Platform)'=='x64'">x64</ArchString>
+    <BuildString />
+    <BuildString Condition="$(Configuration.Contains(Debug))">-dbg</BuildString>
+    <BuildString Condition="$(Configuration.Contains(Devel))">-dev</BuildString>
+    <EXEString>$(ProjectName)$(ArchString)$(SSEString)$(BuildString)</EXEString>
   </PropertyGroup>
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
diff --git a/pcsx2/pcsx2.vcxproj b/pcsx2/pcsx2.vcxproj
index 8d520e4344..cf8be94c8f 100644
--- a/pcsx2/pcsx2.vcxproj
+++ b/pcsx2/pcsx2.vcxproj
@@ -78,6 +78,7 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <TargetName>$(EXEString)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
@@ -99,7 +100,9 @@
       <PreprocessorDefinitions Condition="'$(CI)'=='true'">PCSX2_CI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="!$(Configuration.Contains(AVX2))">_M_SSE=0x401;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="$(Configuration.Contains(AVX2))">_M_SSE=0x501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+      <!-- This flag will throw a warning on x64 as SSE2 is implied-->
+      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
+      <EnableEnhancedInstructionSet Condition="'$(Platform)'!='x64'">StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
       <EnableEnhancedInstructionSet Condition="$(Configuration.Contains(AVX2))">AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
       <MinimalRebuild>false</MinimalRebuild>
       <ObjectFileName>$(IntDir)%(RelativeDir)</ObjectFileName>