From 5ddfa101c933f662ec8e1cbe81c01d944d6c7d34 Mon Sep 17 00:00:00 2001 From: Jingning Han Date: Thu, 23 Jul 2015 11:03:55 -0700 Subject: [PATCH] Add x86_64 flag to guard fwd_txfm_ssse3.asm in make file This fixes a VS build error. Fix by @johannkoenig. Change-Id: I6e71435d70ae56079db7328e4c7915416ece8fda --- vpx_dsp/vpx_dsp.mk | 4 +++- vpx_dsp/x86/{fwd_txfm_ssse3.asm => fwd_txfm_ssse3_x86_64.asm} | 0 2 files changed, 3 insertions(+), 1 deletion(-) rename vpx_dsp/x86/{fwd_txfm_ssse3.asm => fwd_txfm_ssse3_x86_64.asm} (100%) diff --git a/vpx_dsp/vpx_dsp.mk b/vpx_dsp/vpx_dsp.mk index 07f2d6aad..d4aea13d2 100644 --- a/vpx_dsp/vpx_dsp.mk +++ b/vpx_dsp/vpx_dsp.mk @@ -67,8 +67,10 @@ DSP_SRCS-yes += fwd_txfm.c DSP_SRCS-yes += fwd_txfm.h DSP_SRCS-$(HAVE_SSE2) += x86/fwd_txfm_sse2.c DSP_SRCS-$(HAVE_SSE2) += x86/fwd_txfm_impl_sse2.h +ifeq ($(ARCH_X86_64),yes) ifeq ($(CONFIG_USE_X86INC),yes) -DSP_SRCS-$(HAVE_SSSE3) += x86/fwd_txfm_ssse3.asm +DSP_SRCS-$(HAVE_SSSE3) += x86/fwd_txfm_ssse3_x86_64.asm +endif endif DSP_SRCS-$(HAVE_NEON) += arm/fwd_txfm_neon.c endif # CONFIG_VP9_ENCODER diff --git a/vpx_dsp/x86/fwd_txfm_ssse3.asm b/vpx_dsp/x86/fwd_txfm_ssse3_x86_64.asm similarity index 100% rename from vpx_dsp/x86/fwd_txfm_ssse3.asm rename to vpx_dsp/x86/fwd_txfm_ssse3_x86_64.asm