diff options
| author | John Koleszar <jkoleszar@google.com> | 2012-12-21 15:20:41 -0800 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2012-12-27 09:37:19 -0800 |
| commit | 16810c10c1fbe3bb55b3da28a5bb37fe1c184af9 (patch) | |
| tree | 2b5ddbabd155216da43baf137eee93b6fba7eb60 /vp8/vp8cx.mk | |
| parent | b9ce43029298182668d4dcb0e0814189e4a63c2a (diff) | |
| parent | 5ebe94f9f148693a34bc861ef97a7fff6fc38251 (diff) | |
| download | libvpx-16810c10c1fbe3bb55b3da28a5bb37fe1c184af9.tar.gz | |
Merge branch 'vp9-preview' of review:webm/libvpx
Merge the vp9-preview branch into master.
Change-Id: If700b9054676f24bed9deb59050af546c1ca5296
Diffstat (limited to 'vp8/vp8cx.mk')
| -rw-r--r-- | vp8/vp8cx.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/vp8/vp8cx.mk b/vp8/vp8cx.mk index 0ae2f106b..0659407ad 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) @@ -97,6 +95,7 @@ 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 +vp8/encoder/x86/denoising_sse2.c.d: CFLAGS += -msse2 endif endif @@ -115,3 +114,6 @@ 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/asm_enc_offsets.c)) |