Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(76)

Side by Side Diff: source/libvpx/libs.mk

Issue 1124333011: libvpx: Pull from upstream (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libvpx.git@master
Patch Set: only update to last nights LKGR Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 ## 1 ##
2 ## Copyright (c) 2010 The WebM project authors. All Rights Reserved. 2 ## Copyright (c) 2010 The WebM project authors. All Rights Reserved.
3 ## 3 ##
4 ## Use of this source code is governed by a BSD-style license 4 ## Use of this source code is governed by a BSD-style license
5 ## that can be found in the LICENSE file in the root of the source 5 ## that can be found in the LICENSE file in the root of the source
6 ## tree. An additional intellectual property rights grant can be found 6 ## tree. An additional intellectual property rights grant can be found
7 ## in the file PATENTS. All contributing project authors may 7 ## in the file PATENTS. All contributing project authors may
8 ## be found in the AUTHORS file in the root of the source tree. 8 ## be found in the AUTHORS file in the root of the source tree.
9 ## 9 ##
10 10
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 47
48 include $(SRC_PATH_BARE)/vpx_mem/vpx_mem.mk 48 include $(SRC_PATH_BARE)/vpx_mem/vpx_mem.mk
49 CODEC_SRCS-yes += $(addprefix vpx_mem/,$(call enabled,MEM_SRCS)) 49 CODEC_SRCS-yes += $(addprefix vpx_mem/,$(call enabled,MEM_SRCS))
50 50
51 include $(SRC_PATH_BARE)/vpx_scale/vpx_scale.mk 51 include $(SRC_PATH_BARE)/vpx_scale/vpx_scale.mk
52 CODEC_SRCS-yes += $(addprefix vpx_scale/,$(call enabled,SCALE_SRCS)) 52 CODEC_SRCS-yes += $(addprefix vpx_scale/,$(call enabled,SCALE_SRCS))
53 53
54 include $(SRC_PATH_BARE)/vpx_ports/vpx_ports.mk 54 include $(SRC_PATH_BARE)/vpx_ports/vpx_ports.mk
55 CODEC_SRCS-yes += $(addprefix vpx_ports/,$(call enabled,PORTS_SRCS)) 55 CODEC_SRCS-yes += $(addprefix vpx_ports/,$(call enabled,PORTS_SRCS))
56 56
57 include $(SRC_PATH_BARE)/vpx_dsp/vpx_dsp.mk
58 CODEC_SRCS-yes += $(addprefix vpx_dsp/,$(call enabled,DSP_SRCS))
59
57 ifneq ($(CONFIG_VP8_ENCODER)$(CONFIG_VP8_DECODER),) 60 ifneq ($(CONFIG_VP8_ENCODER)$(CONFIG_VP8_DECODER),)
58 VP8_PREFIX=vp8/ 61 VP8_PREFIX=vp8/
59 include $(SRC_PATH_BARE)/$(VP8_PREFIX)vp8_common.mk 62 include $(SRC_PATH_BARE)/$(VP8_PREFIX)vp8_common.mk
60 endif 63 endif
61 64
62 ifeq ($(CONFIG_VP8_ENCODER),yes) 65 ifeq ($(CONFIG_VP8_ENCODER),yes)
63 include $(SRC_PATH_BARE)/$(VP8_PREFIX)vp8cx.mk 66 include $(SRC_PATH_BARE)/$(VP8_PREFIX)vp8cx.mk
64 CODEC_SRCS-yes += $(addprefix $(VP8_PREFIX),$(call enabled,VP8_CX_SRCS)) 67 CODEC_SRCS-yes += $(addprefix $(VP8_PREFIX),$(call enabled,VP8_CX_SRCS))
65 CODEC_EXPORTS-yes += $(addprefix $(VP8_PREFIX),$(VP8_CX_EXPORTS)) 68 CODEC_EXPORTS-yes += $(addprefix $(VP8_PREFIX),$(VP8_CX_EXPORTS))
66 INSTALL-LIBS-yes += include/vpx/vp8.h include/vpx/vp8cx.h 69 INSTALL-LIBS-yes += include/vpx/vp8.h include/vpx/vp8cx.h
(...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after
540 EXAMPLES_BIN_PATH := $(TGT_OS:win64=x64)/Release 543 EXAMPLES_BIN_PATH := $(TGT_OS:win64=x64)/Release
541 endif 544 endif
542 exampletest: examples testdata 545 exampletest: examples testdata
543 $(qexec)$(SRC_PATH_BARE)/test/examples.sh \ 546 $(qexec)$(SRC_PATH_BARE)/test/examples.sh \
544 --test-data-path $(LIBVPX_TEST_DATA_PATH) \ 547 --test-data-path $(LIBVPX_TEST_DATA_PATH) \
545 --bin-path $(EXAMPLES_BIN_PATH) 548 --bin-path $(EXAMPLES_BIN_PATH)
546 else 549 else
547 exampletest: 550 exampletest:
548 @echo Unit tests must be enabled to make the exampletest target. 551 @echo Unit tests must be enabled to make the exampletest target.
549 endif 552 endif
OLDNEW
« no previous file with comments | « source/libvpx/examples/vpx_temporal_svc_encoder.c ('k') | source/libvpx/test/android/Android.mk » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698