Chromium Code Reviews| 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 'use_system_yasm%': 0, |
| 10 'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/libjpeg_turb o', | 10 'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/libjpeg_turb o', |
| (...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 257 [ 'use_system_yasm==1', { | 257 [ 'use_system_yasm==1', { |
| 258 'yasm_path': '<!(which yasm)', | 258 'yasm_path': '<!(which yasm)', |
| 259 }, { | 259 }, { |
| 260 'yasm_path': '<(PRODUCT_DIR)/yasm', | 260 'yasm_path': '<(PRODUCT_DIR)/yasm', |
| 261 }], | 261 }], |
| 262 [ 'target_arch=="ia32"', { | 262 [ 'target_arch=="ia32"', { |
| 263 'yasm_format': '-felf', | 263 'yasm_format': '-felf', |
| 264 'yasm_flags': [ | 264 'yasm_flags': [ |
| 265 '-D__x86__', | 265 '-D__x86__', |
| 266 '-DELF', | 266 '-DELF', |
| 267 '-DPIC', | |
| 267 ], | 268 ], |
| 268 }, { | 269 }, { |
| 269 'yasm_format': '-felf64', | 270 'yasm_format': '-felf64', |
| 270 'yasm_flags': [ | 271 'yasm_flags': [ |
| 271 '-D__x86_64__', | 272 '-D__x86_64__', |
|
fbarchard1
2016/05/18 00:04:14
suggest add
'-DPIC',
for x64 as well.
kjellander_chromium
2016/05/18 04:40:18
Done.
| |
| 272 '-DELF', | 273 '-DELF', |
| 273 ], | 274 ], |
| 274 }], | 275 }], |
| 275 ], | 276 ], |
| 276 }, | 277 }, |
| 277 }], | 278 }], |
| 278 ], | 279 ], |
| 279 'rules': [ | 280 'rules': [ |
| 280 { | 281 { |
| 281 'rule_name': 'assemble', | 282 'rule_name': 'assemble', |
| (...skipping 22 matching lines...) Expand all Loading... | |
| 304 ], | 305 ], |
| 305 }, | 306 }, |
| 306 ], | 307 ], |
| 307 } | 308 } |
| 308 | 309 |
| 309 # Local Variables: | 310 # Local Variables: |
| 310 # tab-width:2 | 311 # tab-width:2 |
| 311 # indent-tabs-mode:nil | 312 # indent-tabs-mode:nil |
| 312 # End: | 313 # End: |
| 313 # vim: set expandtab tabstop=2 shiftwidth=2: | 314 # vim: set expandtab tabstop=2 shiftwidth=2: |
| OLD | NEW |