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

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

Issue 1302353004: libvpx: Pull from upstream (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libvpx.git@master
Patch Set: Created 5 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
« no previous file with comments | « source/libvpx/examples/vp9_spatial_svc_encoder.c ('k') | source/libvpx/test/borders_test.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 CODEC_SRCS-yes += $(VP9_PREFIX)vp9dx.mk vpx/vp8.h vpx/vp8dx.h 102 CODEC_SRCS-yes += $(VP9_PREFIX)vp9dx.mk vpx/vp8.h vpx/vp8dx.h
103 INSTALL-LIBS-yes += include/vpx/vp8.h include/vpx/vp8dx.h 103 INSTALL-LIBS-yes += include/vpx/vp8.h include/vpx/vp8dx.h
104 INSTALL_MAPS += include/vpx/% $(SRC_PATH_BARE)/$(VP9_PREFIX)/% 104 INSTALL_MAPS += include/vpx/% $(SRC_PATH_BARE)/$(VP9_PREFIX)/%
105 CODEC_DOC_SRCS += vpx/vp8.h vpx/vp8dx.h 105 CODEC_DOC_SRCS += vpx/vp8.h vpx/vp8dx.h
106 CODEC_DOC_SECTIONS += vp9 vp9_decoder 106 CODEC_DOC_SECTIONS += vp9 vp9_decoder
107 endif 107 endif
108 108
109 VP9_PREFIX=vp9/ 109 VP9_PREFIX=vp9/
110 $(BUILD_PFX)$(VP9_PREFIX)%.c.o: CFLAGS += -Wextra 110 $(BUILD_PFX)$(VP9_PREFIX)%.c.o: CFLAGS += -Wextra
111 111
112 # VP10 make file
113 ifeq ($(CONFIG_VP10),yes)
114 VP10_PREFIX=vp10/
115 include $(SRC_PATH_BARE)/$(VP10_PREFIX)vp10_common.mk
116 endif
117
118 ifeq ($(CONFIG_VP10_ENCODER),yes)
119 VP10_PREFIX=vp10/
120 include $(SRC_PATH_BARE)/$(VP10_PREFIX)vp10cx.mk
121 CODEC_SRCS-yes += $(addprefix $(VP10_PREFIX),$(call enabled,VP10_CX_SRCS))
122 CODEC_EXPORTS-yes += $(addprefix $(VP10_PREFIX),$(VP10_CX_EXPORTS))
123 CODEC_SRCS-yes += $(VP10_PREFIX)vp10cx.mk vpx/vp8.h vpx/vp8cx.h
124 INSTALL-LIBS-yes += include/vpx/vp8.h include/vpx/vp8cx.h
125 INSTALL-LIBS-$(CONFIG_SPATIAL_SVC) += include/vpx/svc_context.h
126 INSTALL_MAPS += include/vpx/% $(SRC_PATH_BARE)/$(VP10_PREFIX)/%
127 CODEC_DOC_SRCS += vpx/vp8.h vpx/vp8cx.h
128 CODEC_DOC_SECTIONS += vp9 vp9_encoder
129 endif
130
131 ifeq ($(CONFIG_VP10_DECODER),yes)
132 VP10_PREFIX=vp10/
133 include $(SRC_PATH_BARE)/$(VP10_PREFIX)vp10dx.mk
134 CODEC_SRCS-yes += $(addprefix $(VP10_PREFIX),$(call enabled,VP10_DX_SRCS))
135 CODEC_EXPORTS-yes += $(addprefix $(VP10_PREFIX),$(VP10_DX_EXPORTS))
136 CODEC_SRCS-yes += $(VP10_PREFIX)vp10dx.mk vpx/vp8.h vpx/vp8dx.h
137 INSTALL-LIBS-yes += include/vpx/vp8.h include/vpx/vp8dx.h
138 INSTALL_MAPS += include/vpx/% $(SRC_PATH_BARE)/$(VP10_PREFIX)/%
139 CODEC_DOC_SRCS += vpx/vp8.h vpx/vp8dx.h
140 CODEC_DOC_SECTIONS += vp9 vp9_decoder
141 endif
142
143 VP10_PREFIX=vp10/
144 $(BUILD_PFX)$(VP10_PREFIX)%.c.o: CFLAGS += -Wextra
145
112 ifeq ($(CONFIG_ENCODERS),yes) 146 ifeq ($(CONFIG_ENCODERS),yes)
113 CODEC_DOC_SECTIONS += encoder 147 CODEC_DOC_SECTIONS += encoder
114 endif 148 endif
115 ifeq ($(CONFIG_DECODERS),yes) 149 ifeq ($(CONFIG_DECODERS),yes)
116 CODEC_DOC_SECTIONS += decoder 150 CODEC_DOC_SECTIONS += decoder
117 endif 151 endif
118 152
119 153
120 ifeq ($(CONFIG_MSVS),yes) 154 ifeq ($(CONFIG_MSVS),yes)
121 CODEC_LIB=$(if $(CONFIG_STATIC_MSVCRT),vpxmt,vpxmd) 155 CODEC_LIB=$(if $(CONFIG_STATIC_MSVCRT),vpxmt,vpxmd)
(...skipping 469 matching lines...) Expand 10 before | Expand all | Expand 10 after
591 endif 625 endif
592 exampletest exampletest-no-data-check: examples 626 exampletest exampletest-no-data-check: examples
593 $(qexec)$(SRC_PATH_BARE)/test/examples.sh \ 627 $(qexec)$(SRC_PATH_BARE)/test/examples.sh \
594 --test-data-path $(LIBVPX_TEST_DATA_PATH) \ 628 --test-data-path $(LIBVPX_TEST_DATA_PATH) \
595 --bin-path $(EXAMPLES_BIN_PATH) 629 --bin-path $(EXAMPLES_BIN_PATH)
596 exampletest: testdata 630 exampletest: testdata
597 else 631 else
598 exampletest exampletest-no-data-check: 632 exampletest exampletest-no-data-check:
599 @echo Unit tests must be enabled to make the exampletest target. 633 @echo Unit tests must be enabled to make the exampletest target.
600 endif 634 endif
OLDNEW
« no previous file with comments | « source/libvpx/examples/vp9_spatial_svc_encoder.c ('k') | source/libvpx/test/borders_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698