diff options
| author | James Zern <jzern@google.com> | 2014-02-10 15:39:28 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-02-10 15:39:28 -0800 |
| commit | 66bfc69bfc8edbf2cc0e3824db5c569fc52e5b7d (patch) | |
| tree | ccfeba104a6c4b967edb75a818e4574da13e5808 | |
| parent | 3da25f29f59be6f736a9aaf9121b90a4ff9d20ef (diff) | |
| parent | 7cf0c783c1c099177b9b847c01d2c963ddf8288d (diff) | |
| download | libvpx-66bfc69bfc8edbf2cc0e3824db5c569fc52e5b7d.tar libvpx-66bfc69bfc8edbf2cc0e3824db5c569fc52e5b7d.tar.gz libvpx-66bfc69bfc8edbf2cc0e3824db5c569fc52e5b7d.tar.bz2 libvpx-66bfc69bfc8edbf2cc0e3824db5c569fc52e5b7d.zip | |
Merge "*.mk: s/\bUSE_X86INC/CONFIG_USE_X86INC/"
| -rw-r--r-- | libs.mk | 7 | ||||
| -rw-r--r-- | vp9/vp9_common.mk | 2 | ||||
| -rw-r--r-- | vp9/vp9cx.mk | 2 |
3 files changed, 2 insertions, 9 deletions
@@ -57,13 +57,6 @@ CLEAN-OBJS += $$(BUILD_PFX)$(1).h RTCD += $$(BUILD_PFX)$(1).h endef -# x86inc.asm is not compatible with pic 32bit builds. Restrict -# files which use it to 64bit builds or 32bit without pic -USE_X86INC = no -ifeq ($(CONFIG_USE_X86INC),yes) - USE_X86INC = yes -endif - CODEC_SRCS-yes += CHANGELOG CODEC_SRCS-yes += libs.mk diff --git a/vp9/vp9_common.mk b/vp9/vp9_common.mk index f9ba41b22..23a54dddd 100644 --- a/vp9/vp9_common.mk +++ b/vp9/vp9_common.mk @@ -82,7 +82,7 @@ VP9_COMMON_SRCS-$(HAVE_MMX) += common/x86/vp9_postproc_mmx.asm VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/vp9_postproc_sse2.asm endif -ifeq ($(USE_X86INC),yes) +ifeq ($(CONFIG_USE_X86INC),yes) VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/vp9_copy_sse2.asm VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/vp9_intrapred_sse2.asm VP9_COMMON_SRCS-$(HAVE_SSSE3) += common/x86/vp9_intrapred_ssse3.asm diff --git a/vp9/vp9cx.mk b/vp9/vp9cx.mk index 64f9f094c..c0d973b4f 100644 --- a/vp9/vp9cx.mk +++ b/vp9/vp9cx.mk @@ -89,7 +89,7 @@ VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_subpel_variance_impl_sse2.asm VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_temporal_filter_apply_sse2.asm VP9_CX_SRCS-$(HAVE_SSE3) += encoder/x86/vp9_sad_sse3.asm -ifeq ($(USE_X86INC),yes) +ifeq ($(CONFIG_USE_X86INC),yes) VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_error_sse2.asm VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_sad_sse2.asm VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_subtract_sse2.asm |