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

Side by Side Diff: chrome/installer/mini_installer.gyp

Issue 501127: Rearrange build configurations - make it clearer and allow better support for... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years 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
OLDNEW
1 { 1 {
2 'variables': { 2 'variables': {
3 'version_py': '../../chrome/tools/build/version.py', 3 'version_py': '../../chrome/tools/build/version.py',
4 'version_path': '../../chrome/VERSION', 4 'version_path': '../../chrome/VERSION',
5 'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE', 5 'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE',
6 # 'branding_dir' is set in the 'conditions' section at the bottom. 6 # 'branding_dir' is set in the 'conditions' section at the bottom.
7 'msvs_use_common_release': 0, 7 'msvs_use_common_release': 0,
8 'msvs_use_common_linker_extras': 0, 8 'msvs_use_common_linker_extras': 0,
9 }, 9 },
10 'conditions': [ 10 'conditions': [
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 # TODO(bradnelson): change when vsprops are all in gyp. 53 # TODO(bradnelson): change when vsprops are all in gyp.
54 'DelayLoadDLLs': [], 54 'DelayLoadDLLs': [],
55 'EntryPointSymbol': 'MainEntryPoint', 55 'EntryPointSymbol': 'MainEntryPoint',
56 'GenerateMapFile': 'true', 56 'GenerateMapFile': 'true',
57 'IgnoreAllDefaultLibraries': 'true', 57 'IgnoreAllDefaultLibraries': 'true',
58 'OptimizeForWindows98': '1', 58 'OptimizeForWindows98': '1',
59 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 59 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
60 }, 60 },
61 }, 61 },
62 'configurations': { 62 'configurations': {
63 'Debug': { 63 'Debug_Base': {
64 'msvs_settings': { 64 'msvs_settings': {
65 'VCCLCompilerTool': { 65 'VCCLCompilerTool': {
66 'BasicRuntimeChecks': '0', 66 'BasicRuntimeChecks': '0',
67 }, 67 },
68 # TODO(bradnelson): Add these back to common configuration 68 # TODO(bradnelson): Add these back to common configuration
69 # when vsprops goes away. 69 # when vsprops goes away.
70 'VCLinkerTool': { 70 'VCLinkerTool': {
71 'AdditionalDependencies': [ 71 'AdditionalDependencies': [
72 '"$(VCInstallDir)crt\\src\\intel\\mt_lib\\memset.obj"', 72 '"$(VCInstallDir)crt\\src\\intel\\mt_lib\\memset.obj"',
73 '"$(VCInstallDir)crt\\src\\intel\\mt_lib\\P4_memset.obj"', 73 '"$(VCInstallDir)crt\\src\\intel\\mt_lib\\P4_memset.obj"',
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 }, 183 },
184 }], 184 }],
185 ], 185 ],
186 } 186 }
187 187
188 # Local Variables: 188 # Local Variables:
189 # tab-width:2 189 # tab-width:2
190 # indent-tabs-mode:nil 190 # indent-tabs-mode:nil
191 # End: 191 # End:
192 # vim: set expandtab tabstop=2 shiftwidth=2: 192 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « chrome/installer/installer_util.gypi ('k') | chrome/test/interactive_ui/interactive_ui_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698