From e81ca9b41a5f64e43196a7120c2939dae6010163 Mon Sep 17 00:00:00 2001
From: v0lt <mpc-be@mail.ru>
Date: Mon, 8 Jul 2024 18:50:08 +0300
Subject: [PATCH] =?UTF-8?q?=D0=AF=D0=B2=D0=BD=D0=BE=20=D0=BF=D1=80=D0=BE?=
 =?UTF-8?q?=D0=BF=D0=B8=D1=81=D1=8B=D0=B2=D0=B0=D0=B5=D0=BC=20ARCH=5FX86,?=
 =?UTF-8?q?=20ARCH=5FX86=5F32,=20ARCH=5FX86=5F64=20=D0=B4=D0=BB=D1=8F=20?=
 =?UTF-8?q?=D0=B2=D1=81=D0=B5=D1=85=20=D0=BA=D0=BE=D0=BC=D0=BF=D0=B8=D0=BB?=
 =?UTF-8?q?=D1=8F=D1=82=D0=BE=D1=80=D0=BE=D0=B2.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/ExtLib/ffmpeg/config.h | 17 +++++++++--------
 src/common.props           |  4 ++--
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/ExtLib/ffmpeg/config.h b/src/ExtLib/ffmpeg/config.h
index c759492631..1975e56e56 100644
--- a/src/ExtLib/ffmpeg/config.h
+++ b/src/ExtLib/ffmpeg/config.h
@@ -1,9 +1,17 @@
 #ifndef FFMPEG_CONFIG_H
 #define FFMPEG_CONFIG_H
 
+#define ARCH_X86 1
+#ifdef ARCH_X86_64
+	#define ARCH_X86_32 0
+	#define ARCH_X86_64 1
+#else
+	#define ARCH_X86_32 1
+	#define ARCH_X86_64 0
+#endif
+
 #define SWS_MAX_FILTER_SIZE 256
 #ifdef __GNUC__
-	#define ARCH_X86 1
 	#define HAVE_INLINE_ASM 1
 	#define HAVE_AESNI 1
 	#define HAVE_AMD3DNOW 1
@@ -65,16 +73,12 @@
 
 	#ifdef ARCH_X86_64
 		#define BROKEN_RELOCATIONS 1
-		#define ARCH_X86_32 0
-		#define ARCH_X86_64 1
 		#define HAVE_FAST_64BIT 1
 		#define HAVE_FAST_CMOV 1
 		#define HAVE_MM_EMPTY 1
 		#define HAVE_XMM_CLOBBERS 1
 		#define CONFIG_PIC 1
 	#else
-		#define ARCH_X86_32 1
-		#define ARCH_X86_64 0
 		#define HAVE_FAST_64BIT 0
 		#define HAVE_FAST_CMOV 0
 		#define HAVE_MM_EMPTY 0
@@ -141,9 +145,6 @@
 	#define HAVE_SSSE3_INLINE 0
 	#define HAVE_XOP_INLINE 0
 	#define HAVE_I686_INLINE 0
-	#define ARCH_X86 0
-	#define ARCH_X86_32 0
-	#define ARCH_X86_64 0
 	#define HAVE_FAST_64BIT 0
 	#define HAVE_FAST_CMOV 0
 	#define HAVE_MM_EMPTY 0
diff --git a/src/common.props b/src/common.props
index 3781d25127..ec33ca518a 100644
--- a/src/common.props
+++ b/src/common.props
@@ -23,8 +23,8 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <PreprocessorDefinitions>_WINDOWS;WINDOWS;WINVER=0x0A00;_WIN32_WINNT=0x0A00;_WIN32_IE=0x0800;PSAPI_VERSION=1;_USE_MATH_DEFINES;__STDC_CONSTANT_MACROS;_HAS_STD_BYTE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(NOMINMAX)'!='False'">NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Platform)'=='Win32'">WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Platform)'=='x64'">_WIN64;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Platform)'=='Win32'">WIN32;ARCH_X86_32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Platform)'=='x64'">_WIN64;WIN64;ARCH_X86_64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <Lib>