diff options
| author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-04 06:40:16 +0000 |
|---|---|---|
| committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-04 06:40:16 +0000 |
| commit | 1f9471a6fa3f37d206fc56132bb62234e4de3daf (patch) | |
| tree | 75ad845c8d3d3d5bae57a0e1e3020c25fd9ec26f /build/common.gypi | |
| parent | 1c71576ea790a694ee0f3ea445a579ec8ea396f4 (diff) | |
| download | chromium_src-1f9471a6fa3f37d206fc56132bb62234e4de3daf.zip chromium_src-1f9471a6fa3f37d206fc56132bb62234e4de3daf.tar.gz chromium_src-1f9471a6fa3f37d206fc56132bb62234e4de3daf.tar.bz2 | |
Removing the last remaining vsprops files (that are hooked in).
Also pulling in a newer nacl version.
Switching to use AdditionalOptions in list form.
BUG=None
TEST=None
TBR=mmentovai
Review URL: http://codereview.chromium.org/523027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35449 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/common.gypi')
| -rw-r--r-- | build/common.gypi | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/build/common.gypi b/build/common.gypi index 09cf397..b05588b 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -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', + ], }, }, }, |