mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-18 03:19:31 +02:00
9787005846
This broke builds with --disable-mmx, which also disabled assembly entirely, but ARCH_X86 was still true, so the init file tried to find assembly that didn't exist. Instead of checking for architecture, check if external x86 assembly is enabled.
22 lines
1.2 KiB
Makefile
22 lines
1.2 KiB
Makefile
OBJS += x86/cpu.o \
|
|
x86/fixed_dsp_init.o \
|
|
x86/float_dsp_init.o \
|
|
x86/imgutils_init.o \
|
|
x86/lls_init.o \
|
|
|
|
OBJS-$(HAVE_X86ASM) += x86/tx_float_init.o \
|
|
|
|
OBJS-$(CONFIG_PIXELUTILS) += x86/pixelutils_init.o \
|
|
|
|
EMMS_OBJS_$(HAVE_MMX_INLINE)_$(HAVE_MMX_EXTERNAL)_$(HAVE_MM_EMPTY) = x86/emms.o
|
|
|
|
X86ASM-OBJS += x86/cpuid.o \
|
|
$(EMMS_OBJS__yes_) \
|
|
x86/fixed_dsp.o \
|
|
x86/float_dsp.o \
|
|
x86/imgutils.o \
|
|
x86/lls.o \
|
|
x86/tx_float.o \
|
|
|
|
X86ASM-OBJS-$(CONFIG_PIXELUTILS) += x86/pixelutils.o \
|