diff options
Diffstat (limited to 'vp8/vp8cx.mk')
-rw-r--r-- | vp8/vp8cx.mk | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/vp8/vp8cx.mk b/vp8/vp8cx.mk index 0ae2f106b..cd091f39a 100644 --- a/vp8/vp8cx.mk +++ b/vp8/vp8cx.mk @@ -9,8 +9,6 @@ ## -include $(SRC_PATH_BARE)/$(VP8_PREFIX)vp8_common.mk - VP8_CX_EXPORTS += exports_enc VP8_CX_SRCS-yes += $(VP8_COMMON_SRCS-yes) @@ -26,7 +24,6 @@ VP8_CX_SRCS-yes += vp8cx.mk VP8_CX_SRCS-yes += vp8_cx_iface.c -VP8_CX_SRCS-yes += encoder/asm_enc_offsets.c VP8_CX_SRCS-yes += encoder/defaultcoefcounts.h VP8_CX_SRCS-yes += encoder/bitstream.c VP8_CX_SRCS-yes += encoder/boolhuff.c @@ -80,6 +77,7 @@ VP8_CX_SRCS-$(CONFIG_INTERNAL_STATS) += common/postproc.c VP8_CX_SRCS-yes += encoder/temporal_filter.c VP8_CX_SRCS-$(CONFIG_MULTI_RES_ENCODING) += encoder/mr_dissim.c VP8_CX_SRCS-$(CONFIG_MULTI_RES_ENCODING) += encoder/mr_dissim.h +VP8_CX_SRCS-yes += encoder/vp8_asm_enc_offsets.c ifeq ($(CONFIG_REALTIME_ONLY),yes) VP8_CX_SRCS_REMOVE-yes += encoder/firstpass.c @@ -91,13 +89,10 @@ VP8_CX_SRCS-$(HAVE_MMX) += encoder/x86/subtract_mmx.asm VP8_CX_SRCS-$(HAVE_MMX) += encoder/x86/vp8_enc_stubs_mmx.c VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/dct_sse2.asm VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/fwalsh_sse2.asm -VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/quantize_sse2.asm +VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/quantize_sse2.c ifeq ($(CONFIG_TEMPORAL_DENOISING),yes) VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/denoising_sse2.c -ifeq ($(HAVE_SSE2),yes) -vp8/encoder/x86/denoising_sse2.c.o: CFLAGS += -msse2 -endif endif VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/subtract_sse2.asm @@ -113,5 +108,7 @@ ifeq ($(CONFIG_REALTIME_ONLY),yes) VP8_CX_SRCS_REMOVE-$(HAVE_SSE2) += encoder/x86/temporal_filter_apply_sse2.asm endif - VP8_CX_SRCS-yes := $(filter-out $(VP8_CX_SRCS_REMOVE-yes),$(VP8_CX_SRCS-yes)) + +$(eval $(call asm_offsets_template,\ + vp8_asm_enc_offsets.asm, $(VP8_PREFIX)encoder/vp8_asm_enc_offsets.c)) |