diff --git a/src/ExtLib/ffmpeg/config.h b/src/ExtLib/ffmpeg/config.h index 7af071e6ca..254ce6eab2 100644 --- 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 index 8ffecda24d..3781d25127 100644 --- a/src/common.props +++ b/src/common.props @@ -24,7 +24,7 @@ _WINDOWS;WINDOWS;WINVER=0x0A00;_WIN32_WINNT=0x0A00;_WIN32_IE=0x0800;PSAPI_VERSION=1;_USE_MATH_DEFINES;__STDC_CONSTANT_MACROS;_HAS_STD_BYTE=0;%(PreprocessorDefinitions) NOMINMAX;%(PreprocessorDefinitions) WIN32;%(PreprocessorDefinitions) - _WIN64;WIN64;ARCH_X86_64;%(PreprocessorDefinitions) + _WIN64;WIN64;%(PreprocessorDefinitions) Level3