From f1ac712eba767e528e748ff740a8ce98579a09da Mon Sep 17 00:00:00 2001
From: lightningterror <18107717+lightningterror@users.noreply.github.com>
Date: Mon, 21 Mar 2022 10:09:15 +0100
Subject: [PATCH] build: Remove _M_X86_64, __M_X86_64, _M_X86_32 defines.

32bit cleanup.
---
 cmake/BuildParameters.cmake        | 3 +--
 common/common.vcxproj              | 6 +-----
 common/vsprops/CommonLibrary.props | 3 +--
 common/vsprops/common.props        | 3 +--
 4 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/cmake/BuildParameters.cmake b/cmake/BuildParameters.cmake
index e411fe9b01..3c098bb783 100644
--- a/cmake/BuildParameters.cmake
+++ b/cmake/BuildParameters.cmake
@@ -162,10 +162,9 @@ if(${PCSX2_TARGET_ARCHITECTURES} MATCHES "x86_64")
 			set(ARCH_FLAG "-march=native")
 		endif()
 	endif()
-	list(APPEND PCSX2_DEFS _ARCH_64=1 _M_X86=1 _M_X86_64=1 __M_X86_64=1)
+	list(APPEND PCSX2_DEFS _ARCH_64=1 _M_X86=1)
 	set(_ARCH_64 1)
 	set(_M_X86 1)
-	set(_M_X86_64 1)
 else()
 	# All but i386 requires -fPIC
 	set(CMAKE_POSITION_INDEPENDENT_CODE ON)
diff --git a/common/common.vcxproj b/common/common.vcxproj
index ee2b5c2cfa..db05a29f97 100644
--- a/common/common.vcxproj
+++ b/common/common.vcxproj
@@ -110,11 +110,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="EventSource.inl" />
-    <MASM Include="FastJmp.asm">
-      <FileType>Document</FileType>
-      <PreprocessorDefinitions Condition="'$(Platform)'=='Win32'">_M_X86_32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Platform)'=='x64'">_M_X86_64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </MASM>
+    <MASM Include="FastJmp.asm" />
     <None Include="Vulkan\EntryPoints.inl" />
   </ItemGroup>
   <ItemGroup>
diff --git a/common/vsprops/CommonLibrary.props b/common/vsprops/CommonLibrary.props
index ac921a623a..8aa3b8bf69 100644
--- a/common/vsprops/CommonLibrary.props
+++ b/common/vsprops/CommonLibrary.props
@@ -9,8 +9,7 @@
     <ClCompile>
       <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)\3rdparty\wxwidgets3.0\include;$(SolutionDir)\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>
+      <PreprocessorDefinitions Condition="'$(Platform)'=='x64'">_ARCH_64=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StructMemberAlignment>16Bytes</StructMemberAlignment>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <RuntimeTypeInfo>false</RuntimeTypeInfo>
diff --git a/common/vsprops/common.props b/common/vsprops/common.props
index 69f3ed7268..59775bfcfc 100644
--- a/common/vsprops/common.props
+++ b/common/vsprops/common.props
@@ -26,8 +26,7 @@
       <PrecompiledHeaderOutputFile>$(IntDir)pcsx2.pch</PrecompiledHeaderOutputFile>
       <CompileAs>Default</CompileAs>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <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>
+      <PreprocessorDefinitions Condition="'$(Platform)'=='x64'">_ARCH_64=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>setupapi.lib;comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>