diff options
| author | bradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-26 06:41:49 +0000 |
|---|---|---|
| committer | bradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-26 06:41:49 +0000 |
| commit | af7bdc41c8810ddc13992f8c73671a742a3b7c04 (patch) | |
| tree | f7cec454a3d5cd2de499478ffe8adb90a4af7bac /build | |
| parent | 181e8e437290e50c630b9c4feb3d53e0b10c2d83 (diff) | |
| download | chromium_src-af7bdc41c8810ddc13992f8c73671a742a3b7c04.zip chromium_src-af7bdc41c8810ddc13992f8c73671a742a3b7c04.tar.gz chromium_src-af7bdc41c8810ddc13992f8c73671a742a3b7c04.tar.bz2 | |
Moving configuration platform to always be present, as that is required
in order for each configuration to get fully populated in configuration
manager.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/174483
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24436 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build/common.gypi b/build/common.gypi index 694dd32..6e3b9e6 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -274,10 +274,10 @@ }, 'conditions': [ [ 'OS=="win" and msvs_use_common_release', { - 'configuration_platform': 'Win32', 'msvs_props': ['release.vsprops'], }], [ 'OS=="win"', { + 'configuration_platform': 'Win32', 'msvs_configuration_attributes': { 'OutputDirectory': '$(SolutionDir)$(ConfigurationName)', 'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)', @@ -295,6 +295,7 @@ [ 'OS=="win"', { # TODO(bradnelson): add a gyp mechanism to make this more graceful. 'Purify': { + 'configuration_platform': 'Win32', 'defines': [ 'NDEBUG', 'PURIFY', @@ -318,12 +319,12 @@ }, 'conditions': [ [ 'msvs_use_common_release', { - 'configuration_platform': 'Win32', 'msvs_props': ['release.vsprops'], }], ], }, 'Release - no tcmalloc': { + 'configuration_platform': 'Win32', 'defines': [ 'NDEBUG', 'NO_TCMALLOC', @@ -335,7 +336,6 @@ }, 'conditions': [ [ 'msvs_use_common_release', { - 'configuration_platform': 'Win32', 'msvs_props': ['release.vsprops'], }], ], |