diff options
| author | John Koleszar <jkoleszar@google.com> | 2013-04-02 14:54:44 -0700 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2013-04-02 14:54:44 -0700 |
| commit | 42db454c7f99ad97d834edb231b94172d4f29b97 (patch) | |
| tree | 2824f813e12549dd9a6f68086a682238c26886dc /vp9/vp9_common.mk | |
| parent | 49bc402a9479636d6b75693e421473161de98db4 (diff) | |
| parent | 3db60c8c6c6081864e50a162e2236ba03e21828b (diff) | |
| download | libvpx-42db454c7f99ad97d834edb231b94172d4f29b97.tar libvpx-42db454c7f99ad97d834edb231b94172d4f29b97.tar.gz libvpx-42db454c7f99ad97d834edb231b94172d4f29b97.tar.bz2 libvpx-42db454c7f99ad97d834edb231b94172d4f29b97.zip | |
Merge branch 'master' into experimental
Conflicts:
vp9/vp9_common.mk
Change-Id: I2cd5ab47dc31c4210cefc23a282102123d5e2221
Diffstat (limited to 'vp9/vp9_common.mk')
| -rw-r--r-- | vp9/vp9_common.mk | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/vp9/vp9_common.mk b/vp9/vp9_common.mk index ea8631711..5e1ff62f7 100644 --- a/vp9/vp9_common.mk +++ b/vp9/vp9_common.mk @@ -86,7 +86,8 @@ VP9_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/vp9_idct_x86.h VP9_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/vp9_loopfilter_x86.h VP9_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/vp9_postproc_x86.h VP9_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/vp9_asm_stubs.c -VP9_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/vp9_loopfilter_x86.c +VP9_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/vp9_loopfilter_intrin_mmx.c +VP9_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/vp9_loopfilter_intrin_sse2.c VP9_COMMON_SRCS-$(CONFIG_POSTPROC) += common/vp9_postproc.h VP9_COMMON_SRCS-$(CONFIG_POSTPROC) += common/vp9_postproc.c VP9_COMMON_SRCS-$(HAVE_MMX) += common/x86/vp9_iwalsh_mmx.asm @@ -112,14 +113,14 @@ VP9_COMMON_SRCS-$(HAVE_SSE3) += common/x86/vp9_mask_sse3.asm endif VP9_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/vp9_idct_x86.c -VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/vp9_sadmxn_x86.c +VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/vp9_sadmxn_sse2.c ifeq ($(HAVE_SSE2),yes) vp9/common/x86/vp9_idct_x86.c.o: CFLAGS += -msse2 -vp9/common/x86/vp9_loopfilter_x86.c.o: CFLAGS += -msse2 -vp9/common/x86/vp9_sadmxn_x86.c.o: CFLAGS += -msse2 +vp9/common/x86/vp9_loopfilter_intrin_sse2.c.o: CFLAGS += -msse2 +vp9/common/x86/vp9_sadmxn_sse2.c.o: CFLAGS += -msse2 vp9/common/x86/vp9_idct_x86.c.d: CFLAGS += -msse2 -vp9/common/x86/vp9_loopfilter_x86.c.d: CFLAGS += -msse2 -vp9/common/x86/vp9_sadmxn_x86.c.d: CFLAGS += -msse2 +vp9/common/x86/vp9_loopfilter_intrin_sse2.c.d: CFLAGS += -msse2 +vp9/common/x86/vp9_sadmxn_sse2.c.d: CFLAGS += -msse2 endif $(eval $(call asm_offsets_template,\ |