[FFmpeg-cvslog] avutil/x86/Makefile: Make building and linking of emms.c conditional
Ronald S. Bultje
git at videolan.org
Wed Apr 8 17:26:08 CEST 2015
ffmpeg | branch: master | Ronald S. Bultje <rsbultje at gmail.com> | Wed Apr 8 17:17:24 2015 +0200| [b926f02e81165378e615ca619f1283358dac26e4] | committer: Michael Niedermayer
avutil/x86/Makefile: Make building and linking of emms.c conditional
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b926f02e81165378e615ca619f1283358dac26e4
---
libavutil/x86/Makefile | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libavutil/x86/Makefile b/libavutil/x86/Makefile
index ad3bdfc..768ef85 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 \
More information about the ffmpeg-cvslog
mailing list