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 # 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 4651 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4662 'conditions': [ | 4662 'conditions': [ |
| 4663 ['clang==1', { | 4663 ['clang==1', { |
| 4664 # Building with Clang on Windows is a work in progress and very | 4664 # Building with Clang on Windows is a work in progress and very |
| 4665 # experimental. See crbug.com/82385. | 4665 # experimental. See crbug.com/82385. |
| 4666 'VCCLCompilerTool': { | 4666 'VCCLCompilerTool': { |
| 4667 'WarnAsError': 'false', | 4667 'WarnAsError': 'false', |
| 4668 'RuntimeTypeInfo': 'false', | 4668 'RuntimeTypeInfo': 'false', |
| 4669 'AdditionalOptions': [ | 4669 'AdditionalOptions': [ |
| 4670 '/fallback', | 4670 '/fallback', |
| 4671 | 4671 |
| 4672 # The Clang build expects to fall back to VS 2013. | |
| 4673 '-fmsc-version=1800', | |
|
Reid Kleckner
2014/02/11 19:32:12
Does gyp know the version of MSVC that's being use
scottmg
2014/02/11 20:09:07
Yes, it's always set. GYP_MSVS_VERSION will be one
| |
| 4674 | |
| 4672 # Many files use intrinsics without including this header. | 4675 # Many files use intrinsics without including this header. |
| 4673 # TODO(hans): Fix those files, or move this to sub-GYPs. | 4676 # TODO(hans): Fix those files, or move this to sub-GYPs. |
| 4674 '/FIIntrin.h', | 4677 '/FIIntrin.h', |
| 4675 | 4678 |
| 4676 # TODO(hans): Make this list shorter eventually. | 4679 # TODO(hans): Make this list shorter eventually. |
| 4677 '-Qunused-arguments', | 4680 '-Qunused-arguments', |
| 4678 '-Wno-c++11-compat-deprecated-writable-strings', | 4681 '-Wno-c++11-compat-deprecated-writable-strings', |
| 4679 '-Wno-char-subscripts', | 4682 '-Wno-char-subscripts', |
| 4680 '-Wno-deprecated-declarations', | 4683 '-Wno-deprecated-declarations', |
| 4681 '-Wno-deprecated-register', | 4684 '-Wno-deprecated-register', |
| (...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4894 # settings in target dicts. SYMROOT is a special case, because many other | 4897 # settings in target dicts. SYMROOT is a special case, because many other |
| 4895 # Xcode variables depend on it, including variables such as | 4898 # Xcode variables depend on it, including variables such as |
| 4896 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 4899 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 4897 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 4900 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 4898 # files to appear (when present) in the UI as actual files and not red | 4901 # files to appear (when present) in the UI as actual files and not red |
| 4899 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 4902 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 4900 # and therefore SYMROOT, needs to be set at the project level. | 4903 # and therefore SYMROOT, needs to be set at the project level. |
| 4901 'SYMROOT': '<(DEPTH)/xcodebuild', | 4904 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 4902 }, | 4905 }, |
| 4903 } | 4906 } |
| OLD | NEW |