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

Side by Side Diff: build/common.gypi

Issue 149152: Modifying mini_installer to have different additional options.... (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/trunk/src/
Patch Set: '' Created 11 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
« no previous file with comments | « no previous file | chrome/installer/mini_installer.gyp » ('j') | 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) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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 # .gyp files should set chromium_code to 1 if they build Chromium-specific 7 # .gyp files should set chromium_code to 1 if they build Chromium-specific
8 # code, as opposed to external code. This variable is used to control 8 # code, as opposed to external code. This variable is used to control
9 # such things as the set of warnings to enable, and whether warnings are 9 # such things as the set of warnings to enable, and whether warnings are
10 # treated as errors. 10 # treated as errors.
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 # {'variables': {'library': 'shared_library'}} 53 # {'variables': {'library': 'shared_library'}}
54 # to compile as shared by default 54 # to compile as shared by default
55 'library%': 'static_library', 55 'library%': 'static_library',
56 56
57 # TODO(bradnelson): eliminate this when possible. 57 # TODO(bradnelson): eliminate this when possible.
58 # To allow local gyp files to prevent release.vsprops from being included. 58 # To allow local gyp files to prevent release.vsprops from being included.
59 # Yes(1) means include release.vsprops. 59 # Yes(1) means include release.vsprops.
60 # Once all vsprops settings are migrated into gyp, this can go away. 60 # Once all vsprops settings are migrated into gyp, this can go away.
61 'msvs_use_common_release%': 1, 61 'msvs_use_common_release%': 1,
62 62
63 # TODO(bradnelson): eliminate this when possible.
64 # To allow local gyp files to override additional linker options for msvs.
65 # Yes(1) means set use the common linker options.
66 'msvs_use_common_linker_extras%': 1,
67
63 # TODO(sgk): eliminate this if possible. 68 # TODO(sgk): eliminate this if possible.
64 # It would be nicer to support this via a setting in 'target_defaults' 69 # It would be nicer to support this via a setting in 'target_defaults'
65 # in chrome/app/locales/locales.gypi overriding the setting in the 70 # in chrome/app/locales/locales.gypi overriding the setting in the
66 # 'Debug' configuration in the 'target_defaults' dict below, 71 # 'Debug' configuration in the 'target_defaults' dict below,
67 # but that doesn't work as we'd like. 72 # but that doesn't work as we'd like.
68 'msvs_debug_link_incremental%': '2', 73 'msvs_debug_link_incremental%': '2',
69 74
70 # The architecture that we're building on. 75 # The architecture that we're building on.
71 'target_arch%': 'ia32', 76 'target_arch%': 'ia32',
72 77
(...skipping 403 matching lines...) Expand 10 before | Expand all | Expand 10 after
476 'WarningLevel': '3', 481 'WarningLevel': '3',
477 'WarnAsError': 'true', 482 'WarnAsError': 'true',
478 'DebugInformationFormat': '3', 483 'DebugInformationFormat': '3',
479 }, 484 },
480 'VCLibrarianTool': { 485 'VCLibrarianTool': {
481 'AdditionalOptions': '/ignore:4221', 486 'AdditionalOptions': '/ignore:4221',
482 'AdditionalLibraryDirectories': 487 'AdditionalLibraryDirectories':
483 ['<(DEPTH)/third_party/platformsdk_win2008_6_1/files/Lib'], 488 ['<(DEPTH)/third_party/platformsdk_win2008_6_1/files/Lib'],
484 }, 489 },
485 'VCLinkerTool': { 490 'VCLinkerTool': {
486 'AdditionalOptions':
487 '/safeseh:NO /dynamicbase:NO /ignore:4199 /ignore:4221 /nxcompat',
488 'AdditionalDependencies': [ 491 'AdditionalDependencies': [
489 'wininet.lib', 492 'wininet.lib',
490 'version.lib', 493 'version.lib',
491 'msimg32.lib', 494 'msimg32.lib',
492 'ws2_32.lib', 495 'ws2_32.lib',
493 'usp10.lib', 496 'usp10.lib',
494 'psapi.lib', 497 'psapi.lib',
495 'dbghelp.lib', 498 'dbghelp.lib',
496 ], 499 ],
497 'AdditionalLibraryDirectories': 500 'AdditionalLibraryDirectories':
498 ['<(DEPTH)/third_party/platformsdk_win2008_6_1/files/Lib'], 501 ['<(DEPTH)/third_party/platformsdk_win2008_6_1/files/Lib'],
499 'DelayLoadDLLs': [
500 'dbghelp.dll',
501 'dwmapi.dll',
502 'uxtheme.dll',
503 ],
504 'GenerateDebugInformation': 'true', 502 'GenerateDebugInformation': 'true',
505 'MapFileName': '$(OutDir)\\$(TargetName).map', 503 'MapFileName': '$(OutDir)\\$(TargetName).map',
506 'ImportLibrary': '$(OutDir)\\lib\\$(TargetName).lib', 504 'ImportLibrary': '$(OutDir)\\lib\\$(TargetName).lib',
507 'TargetMachine': '1', 505 'TargetMachine': '1',
508 'FixedBaseAddress': '1', 506 'FixedBaseAddress': '1',
509 # SubSystem values: 507 # SubSystem values:
510 # 0 == not set 508 # 0 == not set
511 # 1 == /SUBSYSTEM:CONSOLE 509 # 1 == /SUBSYSTEM:CONSOLE
512 # 2 == /SUBSYSTEM:WINDOWS 510 # 2 == /SUBSYSTEM:WINDOWS
513 # Most of the executables we'll ever create are tests 511 # Most of the executables we'll ever create are tests
(...skipping 24 matching lines...) Expand all
538 ], 536 ],
539 }, { 537 }, {
540 'target_defaults': { 538 'target_defaults': {
541 # In Chromium code, we define __STDC_FORMAT_MACROS in order to get the 539 # In Chromium code, we define __STDC_FORMAT_MACROS in order to get the
542 # C99 macros on Mac and Linux. 540 # C99 macros on Mac and Linux.
543 'defines': [ 541 'defines': [
544 '__STDC_FORMAT_MACROS', 542 '__STDC_FORMAT_MACROS',
545 ], 543 ],
546 }, 544 },
547 }], 545 }],
546 ['msvs_use_common_linker_extras', {
547 'target_defaults': {
548 'msvs_settings': {
549 'VCLinkerTool': {
550 'AdditionalOptions':
551 '/safeseh /dynamicbase /ignore:4199 /ignore:4221 /nxcompat',
552 'DelayLoadDLLs': [
553 'dbghelp.dll',
554 'dwmapi.dll',
555 'uxtheme.dll',
556 ],
557 },
558 },
559 },
560 }],
548 ], 561 ],
549 'scons_settings': { 562 'scons_settings': {
550 'sconsbuild_dir': '<(DEPTH)/sconsbuild', 563 'sconsbuild_dir': '<(DEPTH)/sconsbuild',
551 }, 564 },
552 'xcode_settings': { 565 'xcode_settings': {
553 # The Xcode generator will look for an xcode_settings section at the root 566 # The Xcode generator will look for an xcode_settings section at the root
554 # of each dict and use it to apply settings on a file-wide basis. Most 567 # of each dict and use it to apply settings on a file-wide basis. Most
555 # settings should not be here, they should be in target-specific 568 # settings should not be here, they should be in target-specific
556 # xcode_settings sections, or better yet, should use non-Xcode-specific 569 # xcode_settings sections, or better yet, should use non-Xcode-specific
557 # settings in target dicts. SYMROOT is a special case, because many other 570 # settings in target dicts. SYMROOT is a special case, because many other
558 # Xcode variables depend on it, including variables such as 571 # Xcode variables depend on it, including variables such as
559 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 572 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
560 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 573 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
561 # files to appear (when present) in the UI as actual files and not red 574 # files to appear (when present) in the UI as actual files and not red
562 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 575 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
563 # and therefore SYMROOT, needs to be set at the project level. 576 # and therefore SYMROOT, needs to be set at the project level.
564 'SYMROOT': '<(DEPTH)/xcodebuild', 577 'SYMROOT': '<(DEPTH)/xcodebuild',
565 }, 578 },
566 } 579 }
OLDNEW
« no previous file with comments | « no previous file | chrome/installer/mini_installer.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698