Правильное выставление дефайнов ARCH_X86_32 и ARCH_X86_64.

Aleksoid1978 · Jul 8, 2024 · d7be6b6 · d7be6b6
1 parent b89eafa
commit d7be6b6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/ExtLib/ffmpeg/config.h b/src/ExtLib/ffmpeg/config.h
@@ -148,12 +148,13 @@
 	#define CONFIG_PIC 0
 
 	#define ARCH_X86 1
-	#ifdef ARCH_X86_64
+	#ifdef _WIN64
+		#define ARCH_X86_32 0
 		#define ARCH_X86_64 1
 	#else
+		#define ARCH_X86_32 1
 		#define ARCH_X86_64 0
 	#endif
-	#define ARCH_X86_32 0
 
 	#define av_restrict
 	#define __asm__ __asm

diff --git a/src/common.props b/src/common.props
@@ -24,7 +24,7 @@
       <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;ARCH_X86_64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Platform)'=='x64'">_WIN64;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <Lib>