| 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 'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/libjpeg_turb
o', | 9 'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/libjpeg_turb
o', |
| 10 'conditions': [ | 10 'conditions': [ |
| (...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 213 'yasm_flags': [ | 213 'yasm_flags': [ |
| 214 '-D__x86_64__', | 214 '-D__x86_64__', |
| 215 '-DWIN64', | 215 '-DWIN64', |
| 216 '-DMSVC', | 216 '-DMSVC', |
| 217 '-Iwin/' | 217 '-Iwin/' |
| 218 ], | 218 ], |
| 219 }], | 219 }], |
| 220 ], | 220 ], |
| 221 }, | 221 }, |
| 222 }], | 222 }], |
| 223 [ 'OS=="mac"', { | 223 [ 'OS=="mac" or OS=="ios"', { |
| 224 'dependencies': [ | 224 'dependencies': [ |
| 225 '../yasm/yasm.gyp:yasm#host', | 225 '../yasm/yasm.gyp:yasm#host', |
| 226 ], | 226 ], |
| 227 'variables': { | 227 'variables': { |
| 228 'yasm_path': '<(PRODUCT_DIR)/yasm', | 228 'yasm_path': '<(PRODUCT_DIR)/yasm', |
| 229 'conditions': [ | 229 'conditions': [ |
| 230 [ 'target_arch=="ia32"', { | 230 [ 'target_arch=="ia32"', { |
| 231 'yasm_format': '-fmacho', | 231 'yasm_format': '-fmacho', |
| 232 'yasm_flags': [ | 232 'yasm_flags': [ |
| 233 '-D__x86__', | 233 '-D__x86__', |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 307 ], | 307 ], |
| 308 }, | 308 }, |
| 309 ], | 309 ], |
| 310 } | 310 } |
| 311 | 311 |
| 312 # Local Variables: | 312 # Local Variables: |
| 313 # tab-width:2 | 313 # tab-width:2 |
| 314 # indent-tabs-mode:nil | 314 # indent-tabs-mode:nil |
| 315 # End: | 315 # End: |
| 316 # vim: set expandtab tabstop=2 shiftwidth=2: | 316 # vim: set expandtab tabstop=2 shiftwidth=2: |
| OLD | NEW |