| 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 4692 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4703 '-Wno-tautological-compare', | 4703 '-Wno-tautological-compare', |
| 4704 '-Wno-unknown-pragmas', | 4704 '-Wno-unknown-pragmas', |
| 4705 '-Wno-unsequenced', | 4705 '-Wno-unsequenced', |
| 4706 '-Wno-unused-function', | 4706 '-Wno-unused-function', |
| 4707 '-Wno-unused-private-field', | 4707 '-Wno-unused-private-field', |
| 4708 '-Wno-unused-value', | 4708 '-Wno-unused-value', |
| 4709 '-Wno-unused-variable', | 4709 '-Wno-unused-variable', |
| 4710 '-ferror-limit=1', | 4710 '-ferror-limit=1', |
| 4711 ], | 4711 ], |
| 4712 }, | 4712 }, |
| 4713 'conditions': [ |
| 4714 ['MSVS_VERSION=="2013" or MSVS_VERSION=="2013e"', { |
| 4715 'VCCLCompilerTool': { |
| 4716 'AdditionalOptions': [ |
| 4717 '-fmsc-version=1800', |
| 4718 ], |
| 4719 }, |
| 4720 }], |
| 4721 ['MSVS_VERSION=="2010" or MSVS_VERSION=="2010e"', { |
| 4722 'VCCLCompilerTool': { |
| 4723 'AdditionalOptions': [ |
| 4724 '-fmsc-version=1600', |
| 4725 ], |
| 4726 }, |
| 4727 }], |
| 4728 ], |
| 4713 }], | 4729 }], |
| 4714 ], | 4730 ], |
| 4715 }, | 4731 }, |
| 4716 }, | 4732 }, |
| 4717 }], | 4733 }], |
| 4718 ['disable_nacl==1', { | 4734 ['disable_nacl==1', { |
| 4719 'target_defaults': { | 4735 'target_defaults': { |
| 4720 'defines': [ | 4736 'defines': [ |
| 4721 'DISABLE_NACL', | 4737 'DISABLE_NACL', |
| 4722 ], | 4738 ], |
| (...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4894 # settings in target dicts. SYMROOT is a special case, because many other | 4910 # settings in target dicts. SYMROOT is a special case, because many other |
| 4895 # Xcode variables depend on it, including variables such as | 4911 # Xcode variables depend on it, including variables such as |
| 4896 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 4912 # 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 | 4913 # 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 | 4914 # 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, | 4915 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 4900 # and therefore SYMROOT, needs to be set at the project level. | 4916 # and therefore SYMROOT, needs to be set at the project level. |
| 4901 'SYMROOT': '<(DEPTH)/xcodebuild', | 4917 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 4902 }, | 4918 }, |
| 4903 } | 4919 } |
| OLD | NEW |