aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2015-04-08 17:17:24 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-04-08 17:25:35 +0200
commitb926f02e81165378e615ca619f1283358dac26e4 (patch)
tree749671d8ac20cc79a25f4ff38fb7124771717208
parenta0854c084ea1541591c54aaab1f993ebaf92ffaf (diff)
downloadffmpeg-b926f02e81165378e615ca619f1283358dac26e4.tar.gz
avutil/x86/Makefile: Make building and linking of emms.c conditional
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavutil/x86/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavutil/x86/Makefile b/libavutil/x86/Makefile
index ad3bdfc29d..768ef85e1f 100644
--- a/libavutil/x86/Makefile
+++ b/libavutil/x86/Makefile
@@ -4,8 +4,10 @@ OBJS += x86/cpu.o \
OBJS-$(CONFIG_PIXELUTILS) += x86/pixelutils_init.o \
+EMMS_OBJS_$(HAVE_INLINE_MMX)_$(HAVE_EXTERNAL_MMX)_$(HAVE_MM_EMPTY) = x86/emms.o
+
YASM-OBJS += x86/cpuid.o \
- x86/emms.o \
+ $(EMMS_OBJS_NO_NO_NO) \
x86/float_dsp.o \
x86/lls.o \