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

Side by Side Diff: libvpx.gyp

Issue 8244015: Fix build with system yasm. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 9 years, 2 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 | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 { 4 {
5 'variables': { 5 'variables': {
6 # Generic libvpx C sources for both x86 and ARM targets. 6 # Generic libvpx C sources for both x86 and ARM targets.
7 'libvpx_generic_sources': [ 7 'libvpx_generic_sources': [
8 'source/libvpx/vp8/common/alloccommon.c', 8 'source/libvpx/vp8/common/alloccommon.c',
9 'source/libvpx/vp8/common/blockd.c', 9 'source/libvpx/vp8/common/blockd.c',
10 'source/libvpx/vp8/common/debugmodes.c', 10 'source/libvpx/vp8/common/debugmodes.c',
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 [ '(OS=="linux" or OS=="mac" or OS=="win") and target_arch!="arm"', { 89 [ '(OS=="linux" or OS=="mac" or OS=="win") and target_arch!="arm"', {
90 'targets': [ 90 'targets': [
91 { 91 {
92 # This libvpx target contains both encoder and decoder. 92 # This libvpx target contains both encoder and decoder.
93 # Encoder is configured to be realtime only. 93 # Encoder is configured to be realtime only.
94 'target_name': 'libvpx', 94 'target_name': 'libvpx',
95 'type': 'static_library', 95 'type': 'static_library',
96 'variables': { 96 'variables': {
97 'shared_generated_dir': 97 'shared_generated_dir':
98 '<(SHARED_INTERMEDIATE_DIR)/third_party/libvpx', 98 '<(SHARED_INTERMEDIATE_DIR)/third_party/libvpx',
99 'yasm_path': '<(PRODUCT_DIR)/yasm',
100 'conditions': [ 99 'conditions': [
101 [ 'OS=="linux" and target_arch=="ia32"', { 100 [ 'OS=="linux" and target_arch=="ia32"', {
102 'yasm_flags': [ 101 'yasm_flags': [
103 '-felf32', 102 '-felf32',
104 '-m', 'x86', 103 '-m', 'x86',
105 '-I', 'source/config/linux/ia32', 104 '-I', 'source/config/linux/ia32',
106 '-I', 'source/libvpx', 105 '-I', 'source/libvpx',
107 ], 106 ],
108 }], 107 }],
109 [ 'OS=="linux" and target_arch=="x64"', { 108 [ 'OS=="linux" and target_arch=="x64"', {
(...skipping 14 matching lines...) Expand all
124 }], 123 }],
125 [ 'OS=="win" and target_arch=="ia32"', { 124 [ 'OS=="win" and target_arch=="ia32"', {
126 'yasm_flags': [ 125 'yasm_flags': [
127 '-DPREFIX', 126 '-DPREFIX',
128 '-fwin32', 127 '-fwin32',
129 '-m', 'x86', 128 '-m', 'x86',
130 '-I', 'source/config/win/ia32', 129 '-I', 'source/config/win/ia32',
131 '-I', 'source/libvpx', 130 '-I', 'source/libvpx',
132 ], 131 ],
133 }], 132 }],
133 [ 'use_system_yasm==0', {
134 'yasm_path': '<(PRODUCT_DIR)/yasm',
135 }, { # use_system_yasm == 1
136 'yasm_path': '<!(which yasm)',
137 }],
134 ], 138 ],
135 }, 139 },
136 'dependencies': [ 140 'conditions': [
137 '../yasm/yasm.gyp:yasm#host', 141 [ 'use_system_yasm==0', {
142 'dependencies': [
143 '../yasm/yasm.gyp:yasm#host',
144 ],
145 }],
138 ], 146 ],
139 'include_dirs': [ 147 'include_dirs': [
140 'source/config/<(OS)/<(target_arch)', 148 'source/config/<(OS)/<(target_arch)',
141 'source/libvpx', 149 'source/libvpx',
142 'source/libvpx/vp8/common', 150 'source/libvpx/vp8/common',
143 'source/libvpx/vp8/decoder', 151 'source/libvpx/vp8/decoder',
144 'source/libvpx/vp8/encoder', 152 'source/libvpx/vp8/encoder',
145 ], 153 ],
146 'direct_dependent_settings': { 154 'direct_dependent_settings': {
147 'include_dirs': [ 155 'include_dirs': [
(...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after
519 }, 527 },
520 }, 528 },
521 ], 529 ],
522 } 530 }
523 531
524 # Local Variables: 532 # Local Variables:
525 # tab-width:2 533 # tab-width:2
526 # indent-tabs-mode:nil 534 # indent-tabs-mode:nil
527 # End: 535 # End:
528 # vim: set expandtab tabstop=2 shiftwidth=2: 536 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698