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

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

Issue 12077056: libvpx: Pull from upstream (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 7 years, 10 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
« no previous file with comments | « README.chromium ('k') | source/libvpx/vp8/decoder/decodframe.c » ('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 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 --target=$(TOOLCHAIN) \ 215 --target=$(TOOLCHAIN) \
216 --name=obj_int_extract \ 216 --name=obj_int_extract \
217 --ver=$(CONFIG_VS_VERSION) \ 217 --ver=$(CONFIG_VS_VERSION) \
218 --proj-guid=E1360C65-D375-4335-8057-7ED99CC3F9B2 \ 218 --proj-guid=E1360C65-D375-4335-8057-7ED99CC3F9B2 \
219 $(if $(CONFIG_STATIC_MSVCRT),--static-crt) \ 219 $(if $(CONFIG_STATIC_MSVCRT),--static-crt) \
220 --out=$@ $^ \ 220 --out=$@ $^ \
221 -I. \ 221 -I. \
222 -I"$(SRC_PATH_BARE)" \ 222 -I"$(SRC_PATH_BARE)" \
223 223
224 PROJECTS-$(BUILD_LIBVPX) += obj_int_extract.vcproj 224 PROJECTS-$(BUILD_LIBVPX) += obj_int_extract.vcproj
225 PROJECTS-$(BUILD_LIBVPX) += obj_int_extract.bat
226 225
227 vpx.def: $(call enabled,CODEC_EXPORTS) 226 vpx.def: $(call enabled,CODEC_EXPORTS)
228 @echo " [CREATE] $@" 227 @echo " [CREATE] $@"
229 $(qexec)$(SRC_PATH_BARE)/build/make/gen_msvs_def.sh\ 228 $(qexec)$(SRC_PATH_BARE)/build/make/gen_msvs_def.sh\
230 --name=vpx\ 229 --name=vpx\
231 --out=$@ $^ 230 --out=$@ $^
232 CLEAN-OBJS += vpx.def 231 CLEAN-OBJS += vpx.def
233 232
234 vpx.vcproj: $(CODEC_SRCS) vpx.def 233 vpx.vcproj: $(CODEC_SRCS) vpx.def
235 @echo " [CREATE] $@" 234 @echo " [CREATE] $@"
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
489 @echo "INPUT += $^" >> $@ 488 @echo "INPUT += $^" >> $@
490 @echo "PREDEFINED = VPX_CODEC_DISABLE_COMPAT" >> $@ 489 @echo "PREDEFINED = VPX_CODEC_DISABLE_COMPAT" >> $@
491 @echo "INCLUDE_PATH += ." >> $@; 490 @echo "INCLUDE_PATH += ." >> $@;
492 @echo "ENABLED_SECTIONS += $(sort $(CODEC_DOC_SECTIONS))" >> $@ 491 @echo "ENABLED_SECTIONS += $(sort $(CODEC_DOC_SECTIONS))" >> $@
493 492
494 ## Generate rtcd.h for all objects 493 ## Generate rtcd.h for all objects
495 $(OBJS-yes:.o=.d): $(RTCD) 494 $(OBJS-yes:.o=.d): $(RTCD)
496 495
497 ## Update the global src list 496 ## Update the global src list
498 SRCS += $(CODEC_SRCS) $(LIBVPX_TEST_SRCS) $(GTEST_SRCS) 497 SRCS += $(CODEC_SRCS) $(LIBVPX_TEST_SRCS) $(GTEST_SRCS)
OLDNEW
« no previous file with comments | « README.chromium ('k') | source/libvpx/vp8/decoder/decodframe.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698