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 5678 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5689 }, | 5689 }, |
5690 }], | 5690 }], |
5691 ], | 5691 ], |
5692 'conditions': [ | 5692 'conditions': [ |
5693 # Building with Clang on Windows is a work in progress and very | 5693 # Building with Clang on Windows is a work in progress and very |
5694 # experimental. See crbug.com/82385. | 5694 # experimental. See crbug.com/82385. |
5695 # Keep this in sync with the similar blocks in build/config/compiler
/BUILD.gn | 5695 # Keep this in sync with the similar blocks in build/config/compiler
/BUILD.gn |
5696 ['clang==1', { | 5696 ['clang==1', { |
5697 'VCCLCompilerTool': { | 5697 'VCCLCompilerTool': { |
5698 'AdditionalOptions': [ | 5698 'AdditionalOptions': [ |
5699 '-fmsc-version=1800', | |
5700 | |
5701 # Many files use intrinsics without including this header. | 5699 # Many files use intrinsics without including this header. |
5702 # TODO(hans): Fix those files, or move this to sub-GYPs. | 5700 # TODO(hans): Fix those files, or move this to sub-GYPs. |
5703 '/FIIntrin.h', | 5701 '/FIIntrin.h', |
5704 | 5702 |
5705 # TODO(hans): Make this list shorter eventually. | 5703 # TODO(hans): Make this list shorter eventually. |
5706 '-Qunused-arguments', | 5704 '-Qunused-arguments', |
5707 '-Wno-c++11-compat-deprecated-writable-strings', | 5705 '-Wno-c++11-compat-deprecated-writable-strings', |
5708 '-Wno-deprecated-declarations', | 5706 '-Wno-deprecated-declarations', |
5709 '-Wno-empty-body', | 5707 '-Wno-empty-body', |
5710 '-Wno-enum-conversion', | 5708 '-Wno-enum-conversion', |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5747 ], | 5745 ], |
5748 }, | 5746 }, |
5749 }], | 5747 }], |
5750 ['clang==1 and clang_use_chrome_plugins==1', { | 5748 ['clang==1 and clang_use_chrome_plugins==1', { |
5751 'VCCLCompilerTool': { | 5749 'VCCLCompilerTool': { |
5752 'AdditionalOptions': [ | 5750 'AdditionalOptions': [ |
5753 '<@(clang_chrome_plugins_flags)', | 5751 '<@(clang_chrome_plugins_flags)', |
5754 ], | 5752 ], |
5755 }, | 5753 }, |
5756 }], | 5754 }], |
| 5755 ['clang==1 and MSVS_VERSION == "2013"', { |
| 5756 'VCCLCompilerTool': { |
| 5757 'AdditionalOptions': [ |
| 5758 '-fmsc-version=1800', |
| 5759 ], |
| 5760 }, |
| 5761 }], |
| 5762 ['clang==1 and MSVS_VERSION == "2015"', { |
| 5763 'VCCLCompilerTool': { |
| 5764 'AdditionalOptions': [ |
| 5765 '-fmsc-version=1900', |
| 5766 ], |
| 5767 }, |
| 5768 }], |
5757 ], | 5769 ], |
5758 }, | 5770 }, |
5759 }, | 5771 }, |
5760 }], | 5772 }], |
5761 ['disable_nacl==1', { | 5773 ['disable_nacl==1', { |
5762 'target_defaults': { | 5774 'target_defaults': { |
5763 'defines': [ | 5775 'defines': [ |
5764 'DISABLE_NACL', | 5776 'DISABLE_NACL', |
5765 ], | 5777 ], |
5766 }, | 5778 }, |
(...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6180 # settings in target dicts. SYMROOT is a special case, because many other | 6192 # settings in target dicts. SYMROOT is a special case, because many other |
6181 # Xcode variables depend on it, including variables such as | 6193 # Xcode variables depend on it, including variables such as |
6182 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 6194 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
6183 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 6195 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
6184 # files to appear (when present) in the UI as actual files and not red | 6196 # files to appear (when present) in the UI as actual files and not red |
6185 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 6197 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
6186 # and therefore SYMROOT, needs to be set at the project level. | 6198 # and therefore SYMROOT, needs to be set at the project level. |
6187 'SYMROOT': '<(DEPTH)/xcodebuild', | 6199 'SYMROOT': '<(DEPTH)/xcodebuild', |
6188 }, | 6200 }, |
6189 } | 6201 } |
OLD | NEW |