diff options
| author | James Zern <jzern@google.com> | 2014-08-10 16:15:18 -0700 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2014-08-12 22:54:05 -0700 |
| commit | 3a7d467da9f432f010470b7ae39e5bd7c9247323 (patch) | |
| tree | 587d4b69ab3b43123ccda2305da64d81ac06a92a /examples.mk | |
| parent | ccddd5d0f9a69c7369f9a68c155577e4e0b3afd1 (diff) | |
| download | libvpx-3a7d467da9f432f010470b7ae39e5bd7c9247323.tar.gz | |
libyuv: update to r1041
Change-Id: I38dad398844ee424a7a92a745ab703645018d02b
Diffstat (limited to 'examples.mk')
| -rw-r--r-- | examples.mk | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/examples.mk b/examples.mk index a47db04ae..91bd45aa4 100644 --- a/examples.mk +++ b/examples.mk @@ -9,8 +9,12 @@ ## LIBYUV_SRCS += third_party/libyuv/include/libyuv/basic_types.h \ + third_party/libyuv/include/libyuv/convert.h \ + third_party/libyuv/include/libyuv/convert_argb.h \ + third_party/libyuv/include/libyuv/convert_from.h \ third_party/libyuv/include/libyuv/cpu_id.h \ third_party/libyuv/include/libyuv/planar_functions.h \ + third_party/libyuv/include/libyuv/rotate.h \ third_party/libyuv/include/libyuv/row.h \ third_party/libyuv/include/libyuv/scale.h \ third_party/libyuv/include/libyuv/scale_row.h \ @@ -20,14 +24,15 @@ LIBYUV_SRCS += third_party/libyuv/include/libyuv/basic_types.h \ third_party/libyuv/source/row_common.cc \ third_party/libyuv/source/row_mips.cc \ third_party/libyuv/source/row_neon.cc \ + third_party/libyuv/source/row_neon64.cc \ third_party/libyuv/source/row_posix.cc \ third_party/libyuv/source/row_win.cc \ - third_party/libyuv/source/scale.cc \ + third_party/libyuv/source/scale.cc \ third_party/libyuv/source/scale_common.cc \ third_party/libyuv/source/scale_mips.cc \ third_party/libyuv/source/scale_neon.cc \ third_party/libyuv/source/scale_posix.cc \ - third_party/libyuv/source/scale_win.cc + third_party/libyuv/source/scale_win.cc \ LIBWEBM_MUXER_SRCS += third_party/libwebm/mkvmuxer.cpp \ third_party/libwebm/mkvmuxerutil.cpp \ @@ -210,17 +215,18 @@ endif # from an installed tree or a version controlled tree. Determine # the proper paths. ifeq ($(HAVE_ALT_TREE_LAYOUT),yes) - LIB_PATH := $(SRC_PATH_BARE)/../lib - INC_PATH := $(SRC_PATH_BARE)/../include + LIB_PATH-yes := $(SRC_PATH_BARE)/../lib + INC_PATH-yes := $(SRC_PATH_BARE)/../include else LIB_PATH-yes += $(if $(BUILD_PFX),$(BUILD_PFX),.) INC_PATH-$(CONFIG_VP8_DECODER) += $(SRC_PATH_BARE)/vp8 INC_PATH-$(CONFIG_VP8_ENCODER) += $(SRC_PATH_BARE)/vp8 INC_PATH-$(CONFIG_VP9_DECODER) += $(SRC_PATH_BARE)/vp9 INC_PATH-$(CONFIG_VP9_ENCODER) += $(SRC_PATH_BARE)/vp9 - LIB_PATH := $(call enabled,LIB_PATH) - INC_PATH := $(call enabled,INC_PATH) endif +INC_PATH-$(CONFIG_LIBYUV) += $(SRC_PATH_BARE)/third_party/libyuv/include +LIB_PATH := $(call enabled,LIB_PATH) +INC_PATH := $(call enabled,INC_PATH) INTERNAL_CFLAGS = $(addprefix -I,$(INC_PATH)) INTERNAL_LDFLAGS += $(addprefix -L,$(LIB_PATH)) |