Commit 078f5bf4 authored by Jim Bankoski's avatar Jim Bankoski Committed by Gerrit Code Review
Browse files

Merge "mv dct_sse2.c dct_sse2_intrinsics.c to avoid collision" into experimental

Showing with 3 additions and 3 deletions
...@@ -110,10 +110,10 @@ VP9_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/vp9_quantize_mmx.asm ...@@ -110,10 +110,10 @@ VP9_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/vp9_quantize_mmx.asm
VP9_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/vp9_encodeopt.asm VP9_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/vp9_encodeopt.asm
VP9_CX_SRCS-$(ARCH_X86_64) += encoder/x86/vp9_ssim_opt.asm VP9_CX_SRCS-$(ARCH_X86_64) += encoder/x86/vp9_ssim_opt.asm
VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_dct_sse2.c VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_dct_sse2_intrinsics.c
ifeq ($(HAVE_SSE2),yes) ifeq ($(HAVE_SSE2),yes)
vp9/encoder/x86/vp9_dct_sse2.c.d: CFLAGS += -msse2 vp9/encoder/x86/vp9_dct_sse2_intrinsics.c.d: CFLAGS += -msse2
vp9/encoder/x86/vp9_dct_sse2.c.o: CFLAGS += -msse2 vp9/encoder/x86/vp9_dct_sse2_intrinsics.c.o: CFLAGS += -msse2
endif endif
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment