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

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

Issue 23600008: libvpx: Pull from upstream (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 7 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
« no previous file with comments | « source/libvpx/configure ('k') | source/libvpx/test/convolve_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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 $$(BUILD_PFX)$(1).h: $$(SRC_PATH_BARE)/$(2) 50 $$(BUILD_PFX)$(1).h: $$(SRC_PATH_BARE)/$(2)
51 @echo " [CREATE] $$@" 51 @echo " [CREATE] $$@"
52 $$(qexec)$$(SRC_PATH_BARE)/build/make/rtcd.sh --arch=$$(TGT_ISA) \ 52 $$(qexec)$$(SRC_PATH_BARE)/build/make/rtcd.sh --arch=$$(TGT_ISA) \
53 --sym=$(1) \ 53 --sym=$(1) \
54 --config=$$(CONFIG_DIR)$$(target)$$(if $$(FAT_ARCHS),,-$$(TOOLCHAIN)). mk \ 54 --config=$$(CONFIG_DIR)$$(target)$$(if $$(FAT_ARCHS),,-$$(TOOLCHAIN)). mk \
55 $$(RTCD_OPTIONS) $$^ > $$@ 55 $$(RTCD_OPTIONS) $$^ > $$@
56 CLEAN-OBJS += $$(BUILD_PFX)$(1).h 56 CLEAN-OBJS += $$(BUILD_PFX)$(1).h
57 RTCD += $$(BUILD_PFX)$(1).h 57 RTCD += $$(BUILD_PFX)$(1).h
58 endef 58 endef
59 59
60 # x86inc.asm is not compatible with pic 32bit builds. Restrict
61 # files which use it to 64bit builds or 32bit without pic
62 USE_X86INC = no
63 ifeq ($(CONFIG_USE_X86INC),yes)
64 USE_X86INC = yes
65 endif
66
60 CODEC_SRCS-yes += CHANGELOG 67 CODEC_SRCS-yes += CHANGELOG
61 CODEC_SRCS-yes += libs.mk 68 CODEC_SRCS-yes += libs.mk
62 69
63 # If this is a universal (fat) binary, then all the subarchitectures have 70 # If this is a universal (fat) binary, then all the subarchitectures have
64 # already been built and our job is to stitch them together. The 71 # already been built and our job is to stitch them together. The
65 # BUILD_LIBVPX variable indicates whether we should be building 72 # BUILD_LIBVPX variable indicates whether we should be building
66 # (compiling, linking) the library. The LIPO_LIBVPX variable indicates 73 # (compiling, linking) the library. The LIPO_LIBVPX variable indicates
67 # that we're stitching. 74 # that we're stitching.
68 $(eval $(if $(filter universal%,$(TOOLCHAIN)),LIPO_LIBVPX,BUILD_LIBVPX):=yes) 75 $(eval $(if $(filter universal%,$(TOOLCHAIN)),LIPO_LIBVPX,BUILD_LIBVPX):=yes)
69 76
(...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after
511 @echo "INPUT += $^" >> $@ 518 @echo "INPUT += $^" >> $@
512 @echo "PREDEFINED = VPX_CODEC_DISABLE_COMPAT" >> $@ 519 @echo "PREDEFINED = VPX_CODEC_DISABLE_COMPAT" >> $@
513 @echo "INCLUDE_PATH += ." >> $@; 520 @echo "INCLUDE_PATH += ." >> $@;
514 @echo "ENABLED_SECTIONS += $(sort $(CODEC_DOC_SECTIONS))" >> $@ 521 @echo "ENABLED_SECTIONS += $(sort $(CODEC_DOC_SECTIONS))" >> $@
515 522
516 ## Generate rtcd.h for all objects 523 ## Generate rtcd.h for all objects
517 $(OBJS-yes:.o=.d): $(RTCD) 524 $(OBJS-yes:.o=.d): $(RTCD)
518 525
519 ## Update the global src list 526 ## Update the global src list
520 SRCS += $(CODEC_SRCS) $(LIBVPX_TEST_SRCS) $(GTEST_SRCS) 527 SRCS += $(CODEC_SRCS) $(LIBVPX_TEST_SRCS) $(GTEST_SRCS)
OLDNEW
« no previous file with comments | « source/libvpx/configure ('k') | source/libvpx/test/convolve_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698