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

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

Issue 554673004: libvpx: Pull from upstream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 6 years, 3 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 | Annotate | Revision Log
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 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 include $(SRC_PATH_BARE)/$(VP9_PREFIX)vp9dx.mk 126 include $(SRC_PATH_BARE)/$(VP9_PREFIX)vp9dx.mk
127 CODEC_SRCS-yes += $(addprefix $(VP9_PREFIX),$(call enabled,VP9_DX_SRCS)) 127 CODEC_SRCS-yes += $(addprefix $(VP9_PREFIX),$(call enabled,VP9_DX_SRCS))
128 CODEC_EXPORTS-yes += $(addprefix $(VP9_PREFIX),$(VP9_DX_EXPORTS)) 128 CODEC_EXPORTS-yes += $(addprefix $(VP9_PREFIX),$(VP9_DX_EXPORTS))
129 CODEC_SRCS-yes += $(VP9_PREFIX)vp9dx.mk vpx/vp8.h vpx/vp8dx.h 129 CODEC_SRCS-yes += $(VP9_PREFIX)vp9dx.mk vpx/vp8.h vpx/vp8dx.h
130 INSTALL-LIBS-yes += include/vpx/vp8.h include/vpx/vp8dx.h 130 INSTALL-LIBS-yes += include/vpx/vp8.h include/vpx/vp8dx.h
131 INSTALL_MAPS += include/vpx/% $(SRC_PATH_BARE)/$(VP9_PREFIX)/% 131 INSTALL_MAPS += include/vpx/% $(SRC_PATH_BARE)/$(VP9_PREFIX)/%
132 CODEC_DOC_SRCS += vpx/vp8.h vpx/vp8dx.h 132 CODEC_DOC_SRCS += vpx/vp8.h vpx/vp8dx.h
133 CODEC_DOC_SECTIONS += vp9 vp9_decoder 133 CODEC_DOC_SECTIONS += vp9 vp9_decoder
134 endif 134 endif
135 135
136 VP9_PREFIX=vp9/
137 $(BUILD_PFX)$(VP9_PREFIX)%.c.o: CFLAGS += -Wextra
136 138
137 ifeq ($(CONFIG_ENCODERS),yes) 139 ifeq ($(CONFIG_ENCODERS),yes)
138 CODEC_DOC_SECTIONS += encoder 140 CODEC_DOC_SECTIONS += encoder
139 endif 141 endif
140 ifeq ($(CONFIG_DECODERS),yes) 142 ifeq ($(CONFIG_DECODERS),yes)
141 CODEC_DOC_SECTIONS += decoder 143 CODEC_DOC_SECTIONS += decoder
142 endif 144 endif
143 145
144 146
145 ifeq ($(CONFIG_MSVS),yes) 147 ifeq ($(CONFIG_MSVS),yes)
(...skipping 433 matching lines...) Expand 10 before | Expand all | Expand 10 after
579 EXAMPLES_BIN_PATH := $(TGT_OS:win64=x64)/Release 581 EXAMPLES_BIN_PATH := $(TGT_OS:win64=x64)/Release
580 endif 582 endif
581 exampletest: examples testdata 583 exampletest: examples testdata
582 $(qexec)$(SRC_PATH_BARE)/test/examples.sh \ 584 $(qexec)$(SRC_PATH_BARE)/test/examples.sh \
583 --test-data-path $(LIBVPX_TEST_DATA_PATH) \ 585 --test-data-path $(LIBVPX_TEST_DATA_PATH) \
584 --bin-path $(EXAMPLES_BIN_PATH) 586 --bin-path $(EXAMPLES_BIN_PATH)
585 else 587 else
586 exampletest: 588 exampletest:
587 @echo Unit tests must be enabled to make the exampletest target. 589 @echo Unit tests must be enabled to make the exampletest target.
588 endif 590 endif
OLDNEW
« no previous file with comments | « source/libvpx/examples/vpx_temporal_svc_encoder.c ('k') | source/libvpx/test/active_map_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698