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

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

Issue 12077018: 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 | « source/libvpx/configure ('k') | source/libvpx/vp8/common/mfqe.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
11 11
12 # ARM assembly files are written in RVCT-style. We use some make magic to 12 # ARM assembly files are written in RVCT-style. We use some make magic to
13 # filter those files to allow GCC compilation 13 # filter those files to allow GCC compilation
14 ifeq ($(ARCH_ARM),yes) 14 ifeq ($(ARCH_ARM),yes)
15 ASM:=$(if $(filter yes,$(CONFIG_GCC)),.asm.s,.asm) 15 ASM:=$(if $(filter yes,$(CONFIG_GCC)),.asm.s,.asm)
16 else 16 else
17 ASM:=.asm 17 ASM:=.asm
18 endif 18 endif
19 19
20
21 # 20 #
22 # Calculate platform- and compiler-specific offsets for hand coded assembly 21 # Calculate platform- and compiler-specific offsets for hand coded assembly
23 # 22 #
24 ifeq ($(filter icc gcc,$(TGT_CC)), $(TGT_CC)) 23 ifeq ($(filter icc gcc,$(TGT_CC)), $(TGT_CC))
25 OFFSET_PATTERN:='^[a-zA-Z0-9_]* EQU' 24 OFFSET_PATTERN:='^[a-zA-Z0-9_]* EQU'
26 define asm_offsets_template 25 define asm_offsets_template
27 $$(BUILD_PFX)$(1): $$(BUILD_PFX)$(2).S 26 $$(BUILD_PFX)$(1): $$(BUILD_PFX)$(2).S
28 @echo " [CREATE] $$@" 27 @echo " [CREATE] $$@"
29 $$(qexec)LC_ALL=C grep $$(OFFSET_PATTERN) $$< | tr -d '$$$$\#' $$(ADS2GA S) > $$@ 28 $$(qexec)LC_ALL=C grep $$(OFFSET_PATTERN) $$< | tr -d '$$$$\#' $$(ADS2GA S) > $$@
30 $$(BUILD_PFX)$(2).S: $(2) 29 $$(BUILD_PFX)$(2).S: $(2)
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 $(qexec)echo 'exec_prefix=$${prefix}' >> $@ 319 $(qexec)echo 'exec_prefix=$${prefix}' >> $@
321 $(qexec)echo 'libdir=$${prefix}/$(LIBSUBDIR)' >> $@ 320 $(qexec)echo 'libdir=$${prefix}/$(LIBSUBDIR)' >> $@
322 $(qexec)echo 'includedir=$${prefix}/include' >> $@ 321 $(qexec)echo 'includedir=$${prefix}/include' >> $@
323 $(qexec)echo '' >> $@ 322 $(qexec)echo '' >> $@
324 $(qexec)echo 'Name: vpx' >> $@ 323 $(qexec)echo 'Name: vpx' >> $@
325 $(qexec)echo 'Description: WebM Project VPx codec implementation' >> $@ 324 $(qexec)echo 'Description: WebM Project VPx codec implementation' >> $@
326 $(qexec)echo 'Version: $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH )' >> $@ 325 $(qexec)echo 'Version: $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH )' >> $@
327 $(qexec)echo 'Requires:' >> $@ 326 $(qexec)echo 'Requires:' >> $@
328 $(qexec)echo 'Conflicts:' >> $@ 327 $(qexec)echo 'Conflicts:' >> $@
329 $(qexec)echo 'Libs: -L$${libdir} -lvpx -lm' >> $@ 328 $(qexec)echo 'Libs: -L$${libdir} -lvpx -lm' >> $@
329 ifeq ($(HAVE_PTHREAD_H),yes)
330 $(qexec)echo 'Libs.private: -lm -lpthread' >> $@ 330 $(qexec)echo 'Libs.private: -lm -lpthread' >> $@
331 else
332 $(qexec)echo 'Libs.private: -lm' >> $@
333 endif
331 $(qexec)echo 'Cflags: -I$${includedir}' >> $@ 334 $(qexec)echo 'Cflags: -I$${includedir}' >> $@
332 INSTALL-LIBS-yes += $(LIBSUBDIR)/pkgconfig/vpx.pc 335 INSTALL-LIBS-yes += $(LIBSUBDIR)/pkgconfig/vpx.pc
333 INSTALL_MAPS += $(LIBSUBDIR)/pkgconfig/%.pc %.pc 336 INSTALL_MAPS += $(LIBSUBDIR)/pkgconfig/%.pc %.pc
334 CLEAN-OBJS += vpx.pc 337 CLEAN-OBJS += vpx.pc
335 endif 338 endif
336 339
337 LIBS-$(LIPO_LIBVPX) += libvpx.a 340 LIBS-$(LIPO_LIBVPX) += libvpx.a
338 $(eval $(if $(LIPO_LIBVPX),$(call lipo_lib_template,libvpx.a))) 341 $(eval $(if $(LIPO_LIBVPX),$(call lipo_lib_template,libvpx.a)))
339 342
340 # 343 #
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
486 @echo "INPUT += $^" >> $@ 489 @echo "INPUT += $^" >> $@
487 @echo "PREDEFINED = VPX_CODEC_DISABLE_COMPAT" >> $@ 490 @echo "PREDEFINED = VPX_CODEC_DISABLE_COMPAT" >> $@
488 @echo "INCLUDE_PATH += ." >> $@; 491 @echo "INCLUDE_PATH += ." >> $@;
489 @echo "ENABLED_SECTIONS += $(sort $(CODEC_DOC_SECTIONS))" >> $@ 492 @echo "ENABLED_SECTIONS += $(sort $(CODEC_DOC_SECTIONS))" >> $@
490 493
491 ## Generate rtcd.h for all objects 494 ## Generate rtcd.h for all objects
492 $(OBJS-yes:.o=.d): $(RTCD) 495 $(OBJS-yes:.o=.d): $(RTCD)
493 496
494 ## Update the global src list 497 ## Update the global src list
495 SRCS += $(CODEC_SRCS) $(LIBVPX_TEST_SRCS) $(GTEST_SRCS) 498 SRCS += $(CODEC_SRCS) $(LIBVPX_TEST_SRCS) $(GTEST_SRCS)
OLDNEW
« no previous file with comments | « source/libvpx/configure ('k') | source/libvpx/vp8/common/mfqe.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698