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

Side by Side Diff: libjpeg.gyp

Issue 9560006: Build fix for linux32 after my last change to this file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libjpeg_turbo/
Patch Set: Created 8 years, 9 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 { 5 {
6 'variables': { 6 'variables': {
7 'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/libjpeg_turb o', 7 'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/libjpeg_turb o',
8 'conditions': [ 8 'conditions': [
9 [ 'chromeos == 1 or (os_posix == 1 and \ 9 [ 'chromeos == 1 or (os_posix == 1 and \
10 OS != "mac" and OS != "linux" and OS != "android")', { 10 OS != "mac" and OS != "linux" and OS != "android")', {
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 'yasm_path': '<(PRODUCT_DIR)/yasm', 233 'yasm_path': '<(PRODUCT_DIR)/yasm',
234 }], 234 }],
235 [ 'target_arch=="ia32"', { 235 [ 'target_arch=="ia32"', {
236 'yasm_format': '-felf', 236 'yasm_format': '-felf',
237 'yasm_flag': '-D__X86__', 237 'yasm_flag': '-D__X86__',
238 'yasm_flags': [ 238 'yasm_flags': [
239 '-D__x86__', 239 '-D__x86__',
240 '-DELF', 240 '-DELF',
241 '-Ilinux/' 241 '-Ilinux/'
242 ], 242 ],
243 'yasm_output_filter': [],
243 }, { 244 }, {
244 'yasm_format': '-felf64', 245 'yasm_format': '-felf64',
245 'yasm_flag': '-D__x86_64__', 246 'yasm_flag': '-D__x86_64__',
246 'yasm_flags': [ 247 'yasm_flags': [
247 '-D__x86_64__', 248 '-D__x86_64__',
248 '-DELF', 249 '-DELF',
249 '-Ilinux/' 250 '-Ilinux/'
250 ], 251 ],
251 'yasm_output_filter': [], 252 'yasm_output_filter': [],
252 }], 253 }],
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 ], 303 ],
303 }], 304 }],
304 ], 305 ],
305 } 306 }
306 307
307 # Local Variables: 308 # Local Variables:
308 # tab-width:2 309 # tab-width:2
309 # indent-tabs-mode:nil 310 # indent-tabs-mode:nil
310 # End: 311 # End:
311 # vim: set expandtab tabstop=2 shiftwidth=2: 312 # 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