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

Side by Side Diff: media/media.gyp

Issue 170073002: Define ARCH_X86_32 and ARCH_X86_64 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
« 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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 # Override to dynamically link the cras (ChromeOS audio) library. 8 # Override to dynamically link the cras (ChromeOS audio) library.
9 'use_cras%': 0, 9 'use_cras%': 0,
10 # Option e.g. for Linux distributions to link pulseaudio directly 10 # Option e.g. for Linux distributions to link pulseaudio directly
(...skipping 1314 matching lines...) Expand 10 before | Expand all | Expand 10 after
1325 # fail to link when it creates an empty file list. So add a 1325 # fail to link when it creates an empty file list. So add a
1326 # dummy file keep the linker happy. See http://crbug.com/157073 1326 # dummy file keep the linker happy. See http://crbug.com/157073
1327 'base/simd/xcode_hack.c', 1327 'base/simd/xcode_hack.c',
1328 ], 1328 ],
1329 }], 1329 }],
1330 ['os_posix==1 and OS!="mac"', { 1330 ['os_posix==1 and OS!="mac"', {
1331 'variables': { 1331 'variables': {
1332 'conditions': [ 1332 'conditions': [
1333 ['target_arch=="ia32"', { 1333 ['target_arch=="ia32"', {
1334 'yasm_flags': [ 1334 'yasm_flags': [
1335 '-DX86_32', 1335 '-DARCH_X86_32',
1336 '-DELF', 1336 '-DELF',
1337 ], 1337 ],
1338 }, { 1338 }, { # target_arch=="x64"
1339 'yasm_flags': [ 1339 'yasm_flags': [
1340 '-DARCH_X86_64',
1340 '-DELF', 1341 '-DELF',
1341 '-DPIC', 1342 '-DPIC',
1342 ], 1343 ],
1343 }], 1344 }],
1344 ], 1345 ],
1345 }, 1346 },
1346 }], 1347 }],
1347 ], 1348 ],
1348 'variables': { 1349 'variables': {
1349 'yasm_output_path': '<(SHARED_INTERMEDIATE_DIR)/media', 1350 'yasm_output_path': '<(SHARED_INTERMEDIATE_DIR)/media',
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
1669 ], 1670 ],
1670 }], 1671 }],
1671 ], 1672 ],
1672 }], 1673 }],
1673 ], 1674 ],
1674 }, 1675 },
1675 ], 1676 ],
1676 }], 1677 }],
1677 ], 1678 ],
1678 } 1679 }
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