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

Side by Side Diff: chrome_frame/chrome_frame.gyp

Issue 6034011: Don't build using GPO for the tests EXEs we build during... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 12 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 | Annotate | Revision Log
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2010 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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 'xul_sdk_dir': '../third_party/xulrunner-sdk/<(OS)', 8 'xul_sdk_dir': '../third_party/xulrunner-sdk/<(OS)',
9 9
10 'variables': { 10 'variables': {
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 'DelayLoadDLLs': ['xpcom.dll', 'nspr4.dll'], 215 'DelayLoadDLLs': ['xpcom.dll', 'nspr4.dll'],
216 }, 216 },
217 }, 217 },
218 'dependencies': [ 218 'dependencies': [
219 # TODO(slightlyoff): Get automation targets working on OS X 219 # TODO(slightlyoff): Get automation targets working on OS X
220 '../chrome/chrome.gyp:automation', 220 '../chrome/chrome.gyp:automation',
221 ], 221 ],
222 }], 222 }],
223 ], 223 ],
224 }], 224 }],
225 ['OS=="win" and buildtype=="Official"', {
226 'configurations': {
227 'Release': {
228 'msvs_settings': {
229 'VCCLCompilerTool': {
230 'WholeProgramOptimization': 'false',
231 },
232 },
233 },
234 },
235 },],
225 ['OS=="win"', { 236 ['OS=="win"', {
226 'link_settings': { 237 'link_settings': {
227 'libraries': [ 238 'libraries': [
228 '-lshdocvw.lib', '-loleacc.lib', 239 '-lshdocvw.lib', '-loleacc.lib',
229 ], 240 ],
230 }, 241 },
231 'msvs_settings': { 242 'msvs_settings': {
232 'VCLinkerTool': { 243 'VCLinkerTool': {
233 'DelayLoadDLLs': ['shdocvw.dll'], 244 'DelayLoadDLLs': ['shdocvw.dll'],
234 }, 245 },
(...skipping 950 matching lines...) Expand 10 before | Expand all | Expand 10 after
1185 ], # 'conditions' 1196 ], # 'conditions'
1186 } 1197 }
1187 1198
1188 # vim: shiftwidth=2:et:ai:tabstop=2 1199 # vim: shiftwidth=2:et:ai:tabstop=2
1189 1200
1190 # Local Variables: 1201 # Local Variables:
1191 # tab-width:2 1202 # tab-width:2
1192 # indent-tabs-mode:nil 1203 # indent-tabs-mode:nil
1193 # End: 1204 # End:
1194 # vim: set expandtab tabstop=2 shiftwidth=2: 1205 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698