| 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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 }, | 73 }, |
| 74 'VCLinkerTool': { | 74 'VCLinkerTool': { |
| 75 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS | 75 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS |
| 76 'UACExecutionLevel': '2', # /level='requireAdministrator' | 76 'UACExecutionLevel': '2', # /level='requireAdministrator' |
| 77 'AdditionalDependencies': [ | 77 'AdditionalDependencies': [ |
| 78 'secur32.lib', | 78 'secur32.lib', |
| 79 ], | 79 ], |
| 80 }, | 80 }, |
| 81 'conditions': [ | 81 'conditions': [ |
| 82 ['clang==1', { | 82 ['clang==1', { |
| 83 # atlapp.h contains a global "using namespace WTL;". | |
| 84 # TODO: Remove once cloud_print_service_config.cc no longer depends | 83 # TODO: Remove once cloud_print_service_config.cc no longer depends |
| 85 # on atlapp.h, http://crbug.com/5027 | 84 # on atlapp.h, http://crbug.com/5027 |
| 86 'VCCLCompilerTool': { | 85 'VCCLCompilerTool': { |
| 87 'AdditionalOptions': ['-Wno-header-hygiene'], | 86 'AdditionalOptions': [ |
| 87 # atlapp.h contains a global "using namespace WTL;". |
| 88 '-Wno-header-hygiene', |
| 89 # atlgdi.h does an intentional assignment in an if conditional. |
| 90 '-Wno-parentheses', |
| 91 ], |
| 88 }, | 92 }, |
| 89 }], | 93 }], |
| 90 ], | 94 ], |
| 91 }, | 95 }, |
| 92 }, | 96 }, |
| 93 { | 97 { |
| 94 'target_name': 'cloud_print_service_setup', | 98 'target_name': 'cloud_print_service_setup', |
| 95 'type': 'executable', | 99 'type': 'executable', |
| 96 'sources': [ | 100 'sources': [ |
| 97 '<(SHARED_INTERMEDIATE_DIR)/cloud_print/cloud_print_service_setup_exe_ve
rsion.rc', | 101 '<(SHARED_INTERMEDIATE_DIR)/cloud_print/cloud_print_service_setup_exe_ve
rsion.rc', |
| (...skipping 13 matching lines...) Expand all Loading... |
| 111 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS | 115 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS |
| 112 'UACExecutionLevel': '2', # /level='requireAdministrator' | 116 'UACExecutionLevel': '2', # /level='requireAdministrator' |
| 113 'AdditionalDependencies': [ | 117 'AdditionalDependencies': [ |
| 114 'secur32.lib', | 118 'secur32.lib', |
| 115 ], | 119 ], |
| 116 }, | 120 }, |
| 117 }, | 121 }, |
| 118 }, | 122 }, |
| 119 ], | 123 ], |
| 120 } | 124 } |
| OLD | NEW |