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

Side by Side Diff: third_party/yasm/yasm_compile.gypi

Issue 12059002: Remove -DPREFIX from win64 yasm_compile.gypi to fix ffmpeg linking (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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) 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 # This is an gyp include to use YASM for compiling assembly files. 5 # This is an gyp include to use YASM for compiling assembly files.
6 # 6 #
7 # Files to be compiled with YASM should have an extension of .asm. 7 # Files to be compiled with YASM should have an extension of .asm.
8 # 8 #
9 # There are two variables for this include: 9 # There are two variables for this include:
10 # yasm_flags : Pass additional flags into YASM. 10 # yasm_flags : Pass additional flags into YASM.
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 }], 63 }],
64 [ 'OS=="win" and target_arch=="ia32"', { 64 [ 'OS=="win" and target_arch=="ia32"', {
65 'yasm_flags': [ 65 'yasm_flags': [
66 '-DPREFIX', 66 '-DPREFIX',
67 '-fwin32', 67 '-fwin32',
68 '-m', 'x86', 68 '-m', 'x86',
69 ], 69 ],
70 }], 70 }],
71 [ 'OS=="win" and target_arch=="x64"', { 71 [ 'OS=="win" and target_arch=="x64"', {
72 'yasm_flags': [ 72 'yasm_flags': [
73 '-DPREFIX',
wolenetz 2013/01/22 23:39:59 try bots are failing update. I'll sync my client,
74 '-fx64', 73 '-fx64',
75 '-m', 'amd64', 74 '-m', 'amd64',
76 ], 75 ],
77 }], 76 }],
78 77
79 # Define output extension. 78 # Define output extension.
80 ['OS=="win"', { 79 ['OS=="win"', {
81 'asm_obj_extension': 'obj', 80 'asm_obj_extension': 'obj',
82 }, { 81 }, {
83 'asm_obj_extension': 'o', 82 'asm_obj_extension': 'o',
(...skipping 23 matching lines...) Expand all
107 '<(yasm_path)', 106 '<(yasm_path)',
108 '<@(yasm_flags)', 107 '<@(yasm_flags)',
109 '-o', '<(yasm_output_path)/<(RULE_INPUT_ROOT).<(asm_obj_extension)', 108 '-o', '<(yasm_output_path)/<(RULE_INPUT_ROOT).<(asm_obj_extension)',
110 '<(RULE_INPUT_PATH)', 109 '<(RULE_INPUT_PATH)',
111 ], 110 ],
112 'process_outputs_as_sources': 1, 111 'process_outputs_as_sources': 1,
113 'message': 'Compile assembly <(RULE_INPUT_PATH).', 112 'message': 'Compile assembly <(RULE_INPUT_PATH).',
114 }, 113 },
115 ], # rules 114 ], # rules
116 } 115 }
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