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

Side by Side Diff: chrome/chrome_installer.gypi

Issue 288353004: Only set /ARCH:IA32 on x86 platform (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 7 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
« no previous file with comments | « no previous file | 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) 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 { 5 {
6 'variables': { 6 'variables': {
7 'lastchange_path': '../build/util/LASTCHANGE', 7 'lastchange_path': '../build/util/LASTCHANGE',
8 'libpeer_target_type%': 'static_library', 8 'libpeer_target_type%': 'static_library',
9 # 'branding_dir' is set in the 'conditions' section at the bottom. 9 # 'branding_dir' is set in the 'conditions' section at the bottom.
10 }, 10 },
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 'installer/setup/setup_constants.cc', 288 'installer/setup/setup_constants.cc',
289 'installer/setup/setup_constants.h', 289 'installer/setup/setup_constants.h',
290 'installer/setup/setup_exe_version.rc.version', 290 'installer/setup/setup_exe_version.rc.version',
291 'installer/setup/setup_resource.h', 291 'installer/setup/setup_resource.h',
292 'installer/setup/setup_util.cc', 292 'installer/setup/setup_util.cc',
293 'installer/setup/setup_util.h', 293 'installer/setup/setup_util.h',
294 'installer/setup/uninstall.cc', 294 'installer/setup/uninstall.cc',
295 'installer/setup/uninstall.h', 295 'installer/setup/uninstall.h',
296 ], 296 ],
297 'msvs_settings': { 297 'msvs_settings': {
298 'VCCLCompilerTool': {
299 'EnableEnhancedInstructionSet': '4', # NoExtensions
300 },
301 'VCLinkerTool': { 298 'VCLinkerTool': {
302 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 299 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
303 }, 300 },
304 'VCManifestTool': { 301 'VCManifestTool': {
305 'AdditionalManifestFiles': [ 302 'AdditionalManifestFiles': [
306 '$(ProjectDir)\\installer\\setup\\setup.exe.manifest', 303 '$(ProjectDir)\\installer\\setup\\setup.exe.manifest',
307 ], 304 ],
308 }, 305 },
309 }, 306 },
310 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 307 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
350 'variables': { 347 'variables': {
351 'branding_dir': 'app/theme/google_chrome', 348 'branding_dir': 'app/theme/google_chrome',
352 'branding_dir_100': 'app/theme/default_100_percent/google_chrom e', 349 'branding_dir_100': 'app/theme/default_100_percent/google_chrom e',
353 }, 350 },
354 }, { # else branding!="Chrome" 351 }, { # else branding!="Chrome"
355 'variables': { 352 'variables': {
356 'branding_dir': 'app/theme/chromium', 353 'branding_dir': 'app/theme/chromium',
357 'branding_dir_100': 'app/theme/default_100_percent/chromium', 354 'branding_dir_100': 'app/theme/default_100_percent/chromium',
358 }, 355 },
359 }], 356 }],
357 [ 'target_arch=="ia32"', {
scottmg 2014/05/16 03:36:30 extra space after [
Will Harris 2014/05/16 03:45:26 Done. oh the bad luck of the other gyp file I cop
358 'msvs_settings': {
359 'VCCLCompilerTool': {
360 'EnableEnhancedInstructionSet': '4', # NoExtensions
361 },
362 },
363 }],
360 ], 364 ],
361 }, 365 },
362 { 366 {
363 'target_name': 'setup_unittests', 367 'target_name': 'setup_unittests',
364 'type': 'executable', 368 'type': 'executable',
365 'dependencies': [ 369 'dependencies': [
366 'installer_util', 370 'installer_util',
367 'installer_util_strings', 371 'installer_util_strings',
368 'launcher_support', 372 'launcher_support',
369 '../base/base.gyp:base', 373 '../base/base.gyp:base',
(...skipping 758 matching lines...) Expand 10 before | Expand all | Expand 10 after
1128 'branding_dir_100': 'app/theme/default_100_percent/google_chrome', 1132 'branding_dir_100': 'app/theme/default_100_percent/google_chrome',
1129 }, 1133 },
1130 }, { # else branding!="Chrome" 1134 }, { # else branding!="Chrome"
1131 'variables': { 1135 'variables': {
1132 'branding_dir': 'app/theme/chromium', 1136 'branding_dir': 'app/theme/chromium',
1133 'branding_dir_100': 'app/theme/default_100_percent/chromium', 1137 'branding_dir_100': 'app/theme/default_100_percent/chromium',
1134 }, 1138 },
1135 }], 1139 }],
1136 ], 1140 ],
1137 } 1141 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698