OLD | NEW |
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 # This file is not used when use_system_libjpeg==1. Settings for building with | 6 # This file is not used when use_system_libjpeg==1. Settings for building with |
7 # the system libjpeg is in third_party/libjpeg/libjpeg.gyp. | 7 # the system libjpeg is in third_party/libjpeg/libjpeg.gyp. |
8 'variables': { | 8 'variables': { |
| 9 'use_system_yasm%': 0, |
9 'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/libjpeg_turb
o', | 10 'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/libjpeg_turb
o', |
10 'conditions': [ | 11 'conditions': [ |
11 [ 'OS=="win"', { | 12 [ 'OS=="win"', { |
12 'object_suffix': 'obj', | 13 'object_suffix': 'obj', |
13 }, { | 14 }, { |
14 'object_suffix': 'o', | 15 'object_suffix': 'o', |
15 }], | 16 }], |
16 ], | 17 ], |
17 }, | 18 }, |
18 'targets': [ | 19 'targets': [ |
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
308 ], | 309 ], |
309 }, | 310 }, |
310 ], | 311 ], |
311 } | 312 } |
312 | 313 |
313 # Local Variables: | 314 # Local Variables: |
314 # tab-width:2 | 315 # tab-width:2 |
315 # indent-tabs-mode:nil | 316 # indent-tabs-mode:nil |
316 # End: | 317 # End: |
317 # vim: set expandtab tabstop=2 shiftwidth=2: | 318 # vim: set expandtab tabstop=2 shiftwidth=2: |
OLD | NEW |