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

Side by Side Diff: source/libvpx/vpx_ports/vpx_ports.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/vpx_ports/system_state.h ('k') | source/libvpx/vpx_ports/x86.h » ('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) 2012 The WebM project authors. All Rights Reserved. 2 ## Copyright (c) 2012 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 PORTS_SRCS-yes += vpx_ports.mk 12 PORTS_SRCS-yes += vpx_ports.mk
13 13
14 PORTS_SRCS-yes += bitops.h
14 PORTS_SRCS-yes += mem.h 15 PORTS_SRCS-yes += mem.h
15 PORTS_SRCS-yes += msvc.h 16 PORTS_SRCS-yes += msvc.h
17 PORTS_SRCS-yes += system_state.h
16 PORTS_SRCS-yes += vpx_timer.h 18 PORTS_SRCS-yes += vpx_timer.h
17 19
18 ifeq ($(ARCH_X86)$(ARCH_X86_64),yes) 20 ifeq ($(ARCH_X86)$(ARCH_X86_64),yes)
19 PORTS_SRCS-yes += emms.asm 21 PORTS_SRCS-yes += emms.asm
20 PORTS_SRCS-yes += x86.h 22 PORTS_SRCS-yes += x86.h
21 PORTS_SRCS-yes += x86_abi_support.asm 23 PORTS_SRCS-yes += x86_abi_support.asm
22 endif 24 endif
23 25
24 PORTS_SRCS-$(ARCH_ARM) += arm_cpudetect.c 26 PORTS_SRCS-$(ARCH_ARM) += arm_cpudetect.c
25 PORTS_SRCS-$(ARCH_ARM) += arm.h 27 PORTS_SRCS-$(ARCH_ARM) += arm.h
OLDNEW
« no previous file with comments | « source/libvpx/vpx_ports/system_state.h ('k') | source/libvpx/vpx_ports/x86.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698