From 6a5e6e054951cefc337734f4c0f3c97582c59e09 Mon Sep 17 00:00:00 2001 From: Yaowu Xu Date: Tue, 4 Dec 2012 08:35:37 -0800 Subject: [PATCH] Fix the build with MSVC 1. remove the dependency on non existing "vp9_temporal_filter_x86.h" 2. prefix filenames with vp9_ in obj_int_extract.bat to reflect the change of the actual filenames. Change-Id: Ib1b4d96ac41788f76917764a6722d8461c857302 --- build/x86-msvs/obj_int_extract.bat | 12 ++++++------ vp9/vp9cx.mk | 1 - 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/build/x86-msvs/obj_int_extract.bat b/build/x86-msvs/obj_int_extract.bat index 1b77dfa1f..70b39f68a 100644 --- a/build/x86-msvs/obj_int_extract.bat +++ b/build/x86-msvs/obj_int_extract.bat @@ -7,12 +7,12 @@ REM in the file PATENTS. All contributing project authors may REM be found in the AUTHORS file in the root of the source tree. echo on -cl /I "./" /I "%1" /nologo /c "%1/vp9/common/asm_com_offsets.c" -cl /I "./" /I "%1" /nologo /c "%1/vp9/decoder/asm_dec_offsets.c" -cl /I "./" /I "%1" /nologo /c "%1/vp9/encoder/asm_enc_offsets.c" -obj_int_extract.exe rvds "asm_com_offsets.obj" > "vp9_asm_com_offsets.asm" -obj_int_extract.exe rvds "asm_dec_offsets.obj" > "vp9_asm_dec_offsets.asm" -obj_int_extract.exe rvds "asm_enc_offsets.obj" > "vp9_asm_enc_offsets.asm" +cl /I "./" /I "%1" /nologo /c "%1/vp9/common/vp9_asm_com_offsets.c" +cl /I "./" /I "%1" /nologo /c "%1/vp9/decoder/vp9_asm_dec_offsets.c" +cl /I "./" /I "%1" /nologo /c "%1/vp9/encoder/vp9_asm_enc_offsets.c" +obj_int_extract.exe rvds "vp9_asm_com_offsets.obj" > "vp9_asm_com_offsets.asm" +obj_int_extract.exe rvds "vp9_asm_dec_offsets.obj" > "vp9_asm_dec_offsets.asm" +obj_int_extract.exe rvds "vp9_asm_enc_offsets.obj" > "vp9_asm_enc_offsets.asm" cl /I "./" /I "%1" /nologo /c "%1/vp8/common/asm_com_offsets.c" cl /I "./" /I "%1" /nologo /c "%1/vp8/decoder/asm_dec_offsets.c" diff --git a/vp9/vp9cx.mk b/vp9/vp9cx.mk index d20e79a6c..b19036e1d 100644 --- a/vp9/vp9cx.mk +++ b/vp9/vp9cx.mk @@ -86,7 +86,6 @@ VP9_CX_SRCS-yes += encoder/vp9_mbgraph.h VP9_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/vp9_mcomp_x86.h VP9_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/vp9_quantize_x86.h -VP9_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/vp9_temporal_filter_x86.h VP9_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/vp9_x86_csystemdependent.c VP9_CX_SRCS-$(HAVE_MMX) += encoder/x86/vp9_variance_mmx.c VP9_CX_SRCS-$(HAVE_MMX) += encoder/x86/vp9_variance_impl_mmx.asm -- 2.40.0