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

Side by Side Diff: build/common.gypi

Issue 150045: Learned that mini_installer's linker settings cannot actually be shared... (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/chrome.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
73 # By default linux does not use views. To turn on views in Linux 78 # By default linux does not use views. To turn on views in Linux
74 # set the variable GYP_DEFINES to "toolkit_views=1", or modify 79 # set the variable GYP_DEFINES to "toolkit_views=1", or modify
75 # ~/.gyp/include.gypi . 80 # ~/.gyp/include.gypi .
76 'toolkit_views%': 0, 81 'toolkit_views%': 0,
77 82
78 'linux2%': 0, 83 'linux2%': 0,
79 84
80 'chrome_personalization%': 0, 85 'chrome_personalization%': 0,
81 }, 86 },
82 'target_defaults': { 87 'target_defaults': {
83 'conditions': [ 88 'conditions': [
84 ['branding=="Chrome"', { 89 ['branding=="Chrome"', {
85 'defines': ['GOOGLE_CHROME_BUILD'], 90 'defines': ['GOOGLE_CHROME_BUILD'],
86 'conditions': [ 91 'conditions': [
87 ['OS=="linux"', { 92 ['OS=="linux"', {
88 'cflags': [ '-gstabs' ], 93 'cflags': [ '-gstabs' ],
89 }], 94 }],
(...skipping 386 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 16 matching lines...) Expand all
530 }, 528 },
531 }, 529 },
532 }], 530 }],
533 ['chromium_code==0', { 531 ['chromium_code==0', {
534 # This section must follow the other conditon sections above because 532 # This section must follow the other conditon sections above because
535 # external_code.gypi expects to be merged into those settings. 533 # external_code.gypi expects to be merged into those settings.
536 'includes': [ 534 'includes': [
537 'external_code.gypi', 535 'external_code.gypi',
538 ], 536 ],
539 }], 537 }],
538 ['msvs_use_common_linker_extras', {
539 'VCLinkerTool': {
540 'AdditionalOptions':
541 '/safeseh /dynamicbase /ignore:4199 /ignore:4221 /nxcompat',
sgk 2009/07/06 16:25:07 The section above that it looks like this is inten
542 'DelayLoadDLLs': [
543 'dbghelp.dll',
544 'dwmapi.dll',
545 'uxtheme.dll',
546 ],
547 },
548 }],
540 ], 549 ],
541 'scons_settings': { 550 'scons_settings': {
542 'sconsbuild_dir': '<(DEPTH)/sconsbuild', 551 'sconsbuild_dir': '<(DEPTH)/sconsbuild',
543 }, 552 },
544 'xcode_settings': { 553 'xcode_settings': {
545 # The Xcode generator will look for an xcode_settings section at the root 554 # The Xcode generator will look for an xcode_settings section at the root
546 # of each dict and use it to apply settings on a file-wide basis. Most 555 # of each dict and use it to apply settings on a file-wide basis. Most
547 # settings should not be here, they should be in target-specific 556 # settings should not be here, they should be in target-specific
548 # xcode_settings sections, or better yet, should use non-Xcode-specific 557 # xcode_settings sections, or better yet, should use non-Xcode-specific
549 # settings in target dicts. SYMROOT is a special case, because many other 558 # settings in target dicts. SYMROOT is a special case, because many other
550 # Xcode variables depend on it, including variables such as 559 # Xcode variables depend on it, including variables such as
551 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 560 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
552 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 561 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
553 # files to appear (when present) in the UI as actual files and not red 562 # files to appear (when present) in the UI as actual files and not red
554 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 563 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
555 # and therefore SYMROOT, needs to be set at the project level. 564 # and therefore SYMROOT, needs to be set at the project level.
556 'SYMROOT': '<(DEPTH)/xcodebuild', 565 'SYMROOT': '<(DEPTH)/xcodebuild',
557 }, 566 },
558 } 567 }
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698