| 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 'variables': { | 5 'variables': { |
| 6 'conditions': [ | 6 'conditions': [ |
| 7 ['os_posix==1', { | 7 ['os_posix==1', { |
| 8 'asm_obj_extension': 'o', | 8 'asm_obj_extension': 'o', |
| 9 }], | 9 }], |
| 10 ['OS=="win"', { | 10 ['OS=="win"', { |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 ], | 76 ], |
| 77 'direct_dependent_settings': { | 77 'direct_dependent_settings': { |
| 78 'include_dirs': [ | 78 'include_dirs': [ |
| 79 'source/libvpx', | 79 'source/libvpx', |
| 80 ], | 80 ], |
| 81 }, | 81 }, |
| 82 # VS2010 does not correctly incrementally link obj files generated | 82 # VS2010 does not correctly incrementally link obj files generated |
| 83 # from asm files. This flag disables UseLibraryDependencyInputs to | 83 # from asm files. This flag disables UseLibraryDependencyInputs to |
| 84 # avoid this problem. | 84 # avoid this problem. |
| 85 'msvs_2010_disable_uldi_when_referenced': 1, | 85 'msvs_2010_disable_uldi_when_referenced': 1, |
| 86 'msvs_settings': { |
| 87 'VCCLCompilerTool': { |
| 88 # TODO(scottmg): Enable this: http://crbug.com/140121 |
| 89 'WarnAsError': 'false', |
| 90 }, |
| 91 }, |
| 86 'conditions': [ | 92 'conditions': [ |
| 87 [ 'target_arch=="ia32"', { | 93 [ 'target_arch=="ia32"', { |
| 88 'includes': [ | 94 'includes': [ |
| 89 'libvpx_srcs_x86.gypi', | 95 'libvpx_srcs_x86.gypi', |
| 90 ], | 96 ], |
| 91 }], | 97 }], |
| 92 [ 'target_arch=="x64"', { | 98 [ 'target_arch=="x64"', { |
| 93 'includes': [ | 99 'includes': [ |
| 94 'libvpx_srcs_x86_64.gypi', | 100 'libvpx_srcs_x86_64.gypi', |
| 95 ], | 101 ], |
| (...skipping 362 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 458 ] | 464 ] |
| 459 }, | 465 }, |
| 460 ], | 466 ], |
| 461 } | 467 } |
| 462 | 468 |
| 463 # Local Variables: | 469 # Local Variables: |
| 464 # tab-width:2 | 470 # tab-width:2 |
| 465 # indent-tabs-mode:nil | 471 # indent-tabs-mode:nil |
| 466 # End: | 472 # End: |
| 467 # vim: set expandtab tabstop=2 shiftwidth=2: | 473 # vim: set expandtab tabstop=2 shiftwidth=2: |
| OLD | NEW |