summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorgregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-19 00:58:01 +0000
committergregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-19 00:58:01 +0000
commit0d37bd3b66ad2c9a782e0fefb26addddf39a84cf (patch)
tree7d0bf05c7de90c5635d4e8ec7179c98512dc0a74 /base
parent194970f97e451da5a5da4ce313e8237930d9db3b (diff)
downloadchromium_src-0d37bd3b66ad2c9a782e0fefb26addddf39a84cf.zip
chromium_src-0d37bd3b66ad2c9a782e0fefb26addddf39a84cf.tar.gz
chromium_src-0d37bd3b66ad2c9a782e0fefb26addddf39a84cf.tar.bz2
Revert 35012 - Rearrange build configurations make it clearer and allow better support for x64 on Windows
TEST=none BUG=29467 Review URL: http://codereview.chromium.org/501127 TBR=gregoryd@google.com Review URL: http://codereview.chromium.org/500149 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35016 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r--base/allocator/allocator.gyp4
1 files changed, 2 insertions, 2 deletions
diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp
index fd33645..82876ab 100644
--- a/base/allocator/allocator.gyp
+++ b/base/allocator/allocator.gyp
@@ -20,7 +20,7 @@
],
'direct_dependent_settings': {
'configurations': {
- 'Common_Base': {
+ 'Common': {
'msvs_settings': {
'VCLinkerTool': {
'IgnoreDefaultLibraryNames': ['libcmtd.lib', 'libcmt.lib'],
@@ -261,7 +261,7 @@
},
},
'configurations': {
- 'Debug_Base': {
+ 'Debug': {
'msvs_settings': {
'VCCLCompilerTool': {
'RuntimeLibrary': '0',