| 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 'target_defaults': { | 5 'target_defaults': { |
| 6 'variables': { | 6 'variables': { |
| 7 'chromium_code': 1, | 7 'chromium_code': 1, |
| 8 'enable_wexit_time_destructors': 1, | 8 'enable_wexit_time_destructors': 1, |
| 9 }, | 9 }, |
| 10 'include_dirs': [ | 10 'include_dirs': [ |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 62 'service_resources', | 62 'service_resources', |
| 63 ], | 63 ], |
| 64 'conditions': [ | 64 'conditions': [ |
| 65 ['OS=="win"', { | 65 ['OS=="win"', { |
| 66 'dependencies': [ | 66 'dependencies': [ |
| 67 '<(DEPTH)/chrome/chrome.gyp:chrome_version_header', | 67 '<(DEPTH)/chrome/chrome.gyp:chrome_version_header', |
| 68 '<(DEPTH)/chrome/chrome.gyp:launcher_support', | 68 '<(DEPTH)/chrome/chrome.gyp:launcher_support', |
| 69 '<(DEPTH)/chrome/common_constants.gyp:common_constants', | 69 '<(DEPTH)/chrome/common_constants.gyp:common_constants', |
| 70 ], | 70 ], |
| 71 }], | 71 }], |
| 72 ['OS=="win" and clang==1', { |
| 73 # service_controller.h uses DECLARE_REGISTRY_APPID_RESOURCEID, which |
| 74 # in msvs2013 returns string literals via a non-const pointer. So |
| 75 # disable this warning for now. |
| 76 # TODO(thakis): Remove this once we're on 2014, |
| 77 # https://connect.microsoft.com/VisualStudio/feedback/details/806376/a
tl-hindrances-to-adopting-new-strictstrings-conformance-option-in-vs2013 |
| 78 'msvs_settings': { |
| 79 'VCCLCompilerTool': { |
| 80 'AdditionalOptions': ['-Wno-writable-strings'], |
| 81 }, |
| 82 }, |
| 83 'direct_dependent_settings': { |
| 84 'msvs_settings': { |
| 85 'VCCLCompilerTool': { |
| 86 'AdditionalOptions': ['-Wno-writable-strings'], |
| 87 }, |
| 88 }, |
| 89 }, |
| 90 }], |
| 72 ['enable_printing!=0', { | 91 ['enable_printing!=0', { |
| 73 'dependencies': [ | 92 'dependencies': [ |
| 74 '<(DEPTH)/printing/printing.gyp:printing', | 93 '<(DEPTH)/printing/printing.gyp:printing', |
| 75 ], | 94 ], |
| 76 }], | 95 }], |
| 77 ], | 96 ], |
| 78 'sources': [ | 97 'sources': [ |
| 79 '<(DEPTH)/content/public/common/content_switches.h', | 98 '<(DEPTH)/content/public/common/content_switches.h', |
| 80 '<(DEPTH)/content/public/common/content_switches.cc', | 99 '<(DEPTH)/content/public/common/content_switches.cc', |
| 81 '<(DEPTH)/cloud_print/common/win/cloud_print_utils.cc', | 100 '<(DEPTH)/cloud_print/common/win/cloud_print_utils.cc', |
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 182 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS | 201 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS |
| 183 'UACExecutionLevel': '2', # /level='requireAdministrator' | 202 'UACExecutionLevel': '2', # /level='requireAdministrator' |
| 184 'AdditionalDependencies': [ | 203 'AdditionalDependencies': [ |
| 185 'secur32.lib', | 204 'secur32.lib', |
| 186 ], | 205 ], |
| 187 }, | 206 }, |
| 188 }, | 207 }, |
| 189 }, | 208 }, |
| 190 ], | 209 ], |
| 191 } | 210 } |
| OLD | NEW |