| 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 5785 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5796 ['clang==1', { | 5796 ['clang==1', { |
| 5797 'VCCLCompilerTool': { | 5797 'VCCLCompilerTool': { |
| 5798 'AdditionalOptions': [ | 5798 'AdditionalOptions': [ |
| 5799 # Many files use intrinsics without including this header. | 5799 # Many files use intrinsics without including this header. |
| 5800 # TODO(hans): Fix those files, or move this to sub-GYPs. | 5800 # TODO(hans): Fix those files, or move this to sub-GYPs. |
| 5801 '/FIIntrin.h', | 5801 '/FIIntrin.h', |
| 5802 | 5802 |
| 5803 # TODO(hans): Make this list shorter eventually, http://crbug.
com/504657 | 5803 # TODO(hans): Make this list shorter eventually, http://crbug.
com/504657 |
| 5804 '-Qunused-arguments', # http://crbug.com/504658 | 5804 '-Qunused-arguments', # http://crbug.com/504658 |
| 5805 '-Wno-microsoft', # http://crbug.com/505296 | 5805 '-Wno-microsoft', # http://crbug.com/505296 |
| 5806 '-Wno-switch', # http://crbug.com/505308 | |
| 5807 '-Wno-unknown-pragmas', # http://crbug.com/505314 | 5806 '-Wno-unknown-pragmas', # http://crbug.com/505314 |
| 5808 '-Wno-unused-value', # http://crbug.com/505318 | 5807 '-Wno-unused-value', # http://crbug.com/505318 |
| 5809 ], | 5808 ], |
| 5810 }, | 5809 }, |
| 5811 }], | 5810 }], |
| 5812 ['clang==1 and clang_use_chrome_plugins==1', { | 5811 ['clang==1 and clang_use_chrome_plugins==1', { |
| 5813 'VCCLCompilerTool': { | 5812 'VCCLCompilerTool': { |
| 5814 'AdditionalOptions': [ | 5813 'AdditionalOptions': [ |
| 5815 '<@(clang_chrome_plugins_flags)', | 5814 '<@(clang_chrome_plugins_flags)', |
| 5816 ], | 5815 ], |
| (...skipping 502 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6319 # settings in target dicts. SYMROOT is a special case, because many other | 6318 # settings in target dicts. SYMROOT is a special case, because many other |
| 6320 # Xcode variables depend on it, including variables such as | 6319 # Xcode variables depend on it, including variables such as |
| 6321 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 6320 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 6322 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 6321 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 6323 # files to appear (when present) in the UI as actual files and not red | 6322 # files to appear (when present) in the UI as actual files and not red |
| 6324 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 6323 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 6325 # and therefore SYMROOT, needs to be set at the project level. | 6324 # and therefore SYMROOT, needs to be set at the project level. |
| 6326 'SYMROOT': '<(DEPTH)/xcodebuild', | 6325 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 6327 }, | 6326 }, |
| 6328 } | 6327 } |
| OLD | NEW |