| 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 # IMPORTANT: | 5 # IMPORTANT: |
| 6 # Please don't directly include this file if you are building via gyp_chromium, | 6 # Please don't directly include this file if you are building via gyp_chromium, |
| 7 # since gyp_chromium is automatically forcing its inclusion. | 7 # since gyp_chromium is automatically forcing its inclusion. |
| 8 { | 8 { |
| 9 # Variables expected to be overriden on the GYP command line (-D) or by | 9 # Variables expected to be overriden on the GYP command line (-D) or by |
| 10 # ~/.gyp/include.gypi. | 10 # ~/.gyp/include.gypi. |
| (...skipping 5720 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5731 '-Qunused-arguments', # http://crbug.com/504658 | 5731 '-Qunused-arguments', # http://crbug.com/504658 |
| 5732 '-Wno-microsoft', # http://crbug.com/505296 | 5732 '-Wno-microsoft', # http://crbug.com/505296 |
| 5733 '-Wno-switch', # http://crbug.com/505308 | 5733 '-Wno-switch', # http://crbug.com/505308 |
| 5734 '-Wno-unknown-pragmas', # http://crbug.com/505314 | 5734 '-Wno-unknown-pragmas', # http://crbug.com/505314 |
| 5735 '-Wno-unused-function', # http://crbug.com/505316 | 5735 '-Wno-unused-function', # http://crbug.com/505316 |
| 5736 '-Wno-unused-value', # http://crbug.com/505318 | 5736 '-Wno-unused-value', # http://crbug.com/505318 |
| 5737 '-Wno-unused-local-typedef', # http://crbug.com/411648 | 5737 '-Wno-unused-local-typedef', # http://crbug.com/411648 |
| 5738 ], | 5738 ], |
| 5739 }, | 5739 }, |
| 5740 }], | 5740 }], |
| 5741 ['clang==1 and target_arch=="ia32"', { | |
| 5742 'VCCLCompilerTool': { | |
| 5743 'WarnAsError': 'false', | |
| 5744 'AdditionalOptions': [ | |
| 5745 '/fallback', | |
| 5746 ], | |
| 5747 }, | |
| 5748 }], | |
| 5749 ['clang==1 and clang_use_chrome_plugins==1', { | 5741 ['clang==1 and clang_use_chrome_plugins==1', { |
| 5750 'VCCLCompilerTool': { | 5742 'VCCLCompilerTool': { |
| 5751 'AdditionalOptions': [ | 5743 'AdditionalOptions': [ |
| 5752 '<@(clang_chrome_plugins_flags)', | 5744 '<@(clang_chrome_plugins_flags)', |
| 5753 ], | 5745 ], |
| 5754 }, | 5746 }, |
| 5755 }], | 5747 }], |
| 5756 ['clang==1 and MSVS_VERSION == "2013"', { | 5748 ['clang==1 and MSVS_VERSION == "2013"', { |
| 5757 'VCCLCompilerTool': { | 5749 'VCCLCompilerTool': { |
| 5758 'AdditionalOptions': [ | 5750 'AdditionalOptions': [ |
| (...skipping 445 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6204 # settings in target dicts. SYMROOT is a special case, because many other | 6196 # settings in target dicts. SYMROOT is a special case, because many other |
| 6205 # Xcode variables depend on it, including variables such as | 6197 # Xcode variables depend on it, including variables such as |
| 6206 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 6198 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 6207 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 6199 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 6208 # files to appear (when present) in the UI as actual files and not red | 6200 # files to appear (when present) in the UI as actual files and not red |
| 6209 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 6201 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 6210 # and therefore SYMROOT, needs to be set at the project level. | 6202 # and therefore SYMROOT, needs to be set at the project level. |
| 6211 'SYMROOT': '<(DEPTH)/xcodebuild', | 6203 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 6212 }, | 6204 }, |
| 6213 } | 6205 } |
| OLD | NEW |