Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(570)

Side by Side Diff: cloud_print/service/win/service.gyp

Issue 1210013007: clang/win: Fix warnings to prepare for building without -Wno-reorder. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@clang-unsequenced
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 ['clang==1', { 82 ['clang==1', {
83 # atlapp.h contains a global "using namespace WTL;". 83 # atlapp.h contains a global "using namespace WTL;".
84 # TODO: Remove once cloud_print_service_config.cc no longer depends 84 # TODO: Remove once cloud_print_service_config.cc no longer depends
85 # on atlapp.h, http://crbug.com/5027 85 # on atlapp.h, http://crbug.com/5027
86 'VCCLCompilerTool': { 86 'VCCLCompilerTool': {
87 'AdditionalOptions': ['-Wno-header-hygiene'], 87 'AdditionalOptions': ['-Wno-header-hygiene'],
88 }, 88 },
89 }], 89 }],
90 ], 90 ],
91 }, 91 },
92 'variables': {
93 'clang_warning_flags': [
94 # atlgdi.h fails with -Wreorder enabled.
95 '-Wno-reorder',
96 ]
97 },
92 }, 98 },
93 { 99 {
94 'target_name': 'cloud_print_service_setup', 100 'target_name': 'cloud_print_service_setup',
95 'type': 'executable', 101 'type': 'executable',
96 'sources': [ 102 'sources': [
97 '<(SHARED_INTERMEDIATE_DIR)/cloud_print/cloud_print_service_setup_exe_ve rsion.rc', 103 '<(SHARED_INTERMEDIATE_DIR)/cloud_print/cloud_print_service_setup_exe_ve rsion.rc',
98 'installer.cc', 104 'installer.cc',
99 'installer.h', 105 'installer.h',
100 ], 106 ],
101 'includes': [ 107 'includes': [
102 'service_resources.gypi' 108 'service_resources.gypi'
103 ], 109 ],
104 'dependencies': [ 110 'dependencies': [
105 '<(DEPTH)/cloud_print/cloud_print_resources.gyp:cloud_print_version_reso urces', 111 '<(DEPTH)/cloud_print/cloud_print_resources.gyp:cloud_print_version_reso urces',
106 '<(DEPTH)/cloud_print/common/common.gyp:cloud_print_install_lib', 112 '<(DEPTH)/cloud_print/common/common.gyp:cloud_print_install_lib',
107 '<(DEPTH)/cloud_print/service/service.gyp:cloud_print_service_lib', 113 '<(DEPTH)/cloud_print/service/service.gyp:cloud_print_service_lib',
108 ], 114 ],
109 'msvs_settings': { 115 'msvs_settings': {
110 'VCLinkerTool': { 116 'VCLinkerTool': {
111 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 117 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
112 'UACExecutionLevel': '2', # /level='requireAdministrator' 118 'UACExecutionLevel': '2', # /level='requireAdministrator'
113 'AdditionalDependencies': [ 119 'AdditionalDependencies': [
114 'secur32.lib', 120 'secur32.lib',
115 ], 121 ],
116 }, 122 },
117 }, 123 },
118 }, 124 },
119 ], 125 ],
120 } 126 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698