From 970ed11def2c7f64aaf1e6cfaaa8fc87609c4958 Mon Sep 17 00:00:00 2001
From: TellowKrinkle <tellowkrinkle@gmail.com>
Date: Wed, 1 Jul 2020 16:59:18 -0500
Subject: [PATCH] vsprops: Add __M_X86_64 flag to win64 build

Required to build x86-64 correctly
---
 common/vsprops/CommonLibrary.props            | 2 ++
 pcsx2/windows/VCprojects/vsprops/common.props | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/common/vsprops/CommonLibrary.props b/common/vsprops/CommonLibrary.props
index 4e33ef29a6..750d3e8c30 100644
--- a/common/vsprops/CommonLibrary.props
+++ b/common/vsprops/CommonLibrary.props
@@ -13,6 +13,8 @@
     <ClCompile>
       <AdditionalIncludeDirectories>$(SvnRootDir)\common\include\$(ProjectName);$(SvnRootDir)\common\include;$(SvnRootDir)\3rdparty\wxwidgets3.0\include;$(SvnRootDir)\3rdparty;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>__WIN32__;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Platform)'=='x64'">_ARCH_64=1;_M_X86_64;__M_X86_64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Platform)'=='Win32'">_ARCH_32=1;_M_X86_32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StructMemberAlignment>16Bytes</StructMemberAlignment>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <RuntimeTypeInfo>false</RuntimeTypeInfo>
diff --git a/pcsx2/windows/VCprojects/vsprops/common.props b/pcsx2/windows/VCprojects/vsprops/common.props
index a817dfbc38..cff9734b8c 100644
--- a/pcsx2/windows/VCprojects/vsprops/common.props
+++ b/pcsx2/windows/VCprojects/vsprops/common.props
@@ -18,7 +18,7 @@
       <PrecompiledHeaderOutputFile>$(IntDir)pcsx2.pch</PrecompiledHeaderOutputFile>
       <CompileAs>Default</CompileAs>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <PreprocessorDefinitions Condition="'$(Platform)'=='x64'">_ARCH_64=1;_M_X86_64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Platform)'=='x64'">_ARCH_64=1;_M_X86_64;__M_X86_64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Platform)'=='Win32'">_ARCH_32=1;_M_X86_32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>