| 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 3083 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3094 'WarnAsError': 'true', | 3094 'WarnAsError': 'true', |
| 3095 'Detect64BitPortabilityProblems': 'false', | 3095 'Detect64BitPortabilityProblems': 'false', |
| 3096 }, | 3096 }, |
| 3097 }, | 3097 }, |
| 3098 'conditions': [ | 3098 'conditions': [ |
| 3099 ['buildtype=="Official"', { | 3099 ['buildtype=="Official"', { |
| 3100 'msvs_settings': { | 3100 'msvs_settings': { |
| 3101 'VCCLCompilerTool': { 'WarnAsError': 'false' }, | 3101 'VCCLCompilerTool': { 'WarnAsError': 'false' }, |
| 3102 } | 3102 } |
| 3103 }], | 3103 }], |
| 3104 ['clang==1', { | |
| 3105 'msvs_settings': { | |
| 3106 'VCCLCompilerTool': { 'WarnAsError': 'false' }, | |
| 3107 } | |
| 3108 }], | |
| 3109 [ 'component=="shared_library"', { | 3104 [ 'component=="shared_library"', { |
| 3110 # TODO(darin): Unfortunately, some third_party code depends on bas
e. | 3105 # TODO(darin): Unfortunately, some third_party code depends on bas
e. |
| 3111 'msvs_disabled_warnings': [ | 3106 'msvs_disabled_warnings': [ |
| 3112 4251, # class 'std::xx' needs to have dll-interface. | 3107 4251, # class 'std::xx' needs to have dll-interface. |
| 3113 ], | 3108 ], |
| 3114 }], | 3109 }], |
| 3115 ], | 3110 ], |
| 3116 }], | 3111 }], |
| 3117 | 3112 |
| 3118 [ 'OS=="mac" or OS=="ios"', { | 3113 [ 'OS=="mac" or OS=="ios"', { |
| (...skipping 2891 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6010 # settings in target dicts. SYMROOT is a special case, because many other | 6005 # settings in target dicts. SYMROOT is a special case, because many other |
| 6011 # Xcode variables depend on it, including variables such as | 6006 # Xcode variables depend on it, including variables such as |
| 6012 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 6007 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 6013 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 6008 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 6014 # files to appear (when present) in the UI as actual files and not red | 6009 # files to appear (when present) in the UI as actual files and not red |
| 6015 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 6010 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 6016 # and therefore SYMROOT, needs to be set at the project level. | 6011 # and therefore SYMROOT, needs to be set at the project level. |
| 6017 'SYMROOT': '<(DEPTH)/xcodebuild', | 6012 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 6018 }, | 6013 }, |
| 6019 } | 6014 } |
| OLD | NEW |