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

Unified Diff: build/common.gypi

Issue 523027: Removing the last remaining vsprops files.... (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/trunk/src/
Patch Set: '' Created 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/allocator/allocator.gyp ('k') | build/common.vsprops » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
===================================================================
--- build/common.gypi (revision 35447)
+++ build/common.gypi (working copy)
@@ -387,7 +387,7 @@
'VCCLCompilerTool': {
# /Z7, not /Zi, so coverage is happyb
'DebugInformationFormat': '1',
- 'AdditionalOptions': '/Yd',
+ 'AdditionalOptions': ['/Yd'],
}
}
}], # OS==win
@@ -547,7 +547,7 @@
'inherit_from': ['Common_Base', 'x86_Base', 'Release_Base'],
'conditions': [
['msvs_use_common_release', {
- 'msvs_props': ['release.vsprops'],
+ 'includes': ['release.gypi'],
}],
]
},
@@ -564,7 +564,7 @@
'inherit_from': ['Common_Base', 'x64_Base', 'Release_Base'],
},
'Purify_x64': {
- 'inherit_from': ['Common_Base', 'x64_Base', 'Release_Base', 'Purify'],
+ 'inherit_from': ['Common_Base', 'x64_Base', 'Release_Base', 'Purify_Base'],
},
}],
],
@@ -977,12 +977,12 @@
'DebugInformationFormat': '3',
'conditions': [
[ 'msvs_multi_core_compile', {
- 'AdditionalOptions': '/MP',
+ 'AdditionalOptions': ['/MP'],
}],
],
},
'VCLibrarianTool': {
- 'AdditionalOptions': '/ignore:4221',
+ 'AdditionalOptions': ['/ignore:4221'],
'AdditionalLibraryDirectories':
['<(DEPTH)/third_party/platformsdk_win7/files/Lib'],
},
@@ -1097,17 +1097,26 @@
'x86_Base': {
'msvs_settings': {
'VCLinkerTool': {
- 'AdditionalOptions':
- '/safeseh /dynamicbase /ignore:4199 /ignore:4221 /nxcompat',
+ 'AdditionalOptions': [
+ '/safeseh',
+ '/dynamicbase',
+ '/ignore:4199',
+ '/ignore:4221',
+ '/nxcompat',
+ ],
},
},
},
'x64_Base': {
'msvs_settings': {
'VCLinkerTool': {
- 'AdditionalOptions':
+ 'AdditionalOptions': [
# safeseh is not compatible with x64
- '/dynamicbase /ignore:4199 /ignore:4221 /nxcompat',
+ '/dynamicbase',
+ '/ignore:4199',
+ '/ignore:4221',
+ '/nxcompat',
+ ],
},
},
},
« no previous file with comments | « base/allocator/allocator.gyp ('k') | build/common.vsprops » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698