diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-19 06:07:01 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-19 06:07:01 +0000 |
| commit | 1232bb40bc27fcfaaca6d18a89907b63d24d05d5 (patch) | |
| tree | ea2042089ce20557cd8e71c554706c1a335c37b4 | |
| parent | cd416d8ed476ea7057813bb130b938f4f3047609 (diff) | |
| download | chromium_src-1232bb40bc27fcfaaca6d18a89907b63d24d05d5.zip chromium_src-1232bb40bc27fcfaaca6d18a89907b63d24d05d5.tar.gz chromium_src-1232bb40bc27fcfaaca6d18a89907b63d24d05d5.tar.bz2 | |
Explicitly set {Output,Intermediate}Directory on all configurations,
so that all .gyp files use the same output locations regardless
of whether they're still using the old checked-in release.vsprops file.
BUG=none
TEST=successful build of the Purify configuration
Review URL: http://codereview.chromium.org/172077
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23698 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | build/common.gypi | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/build/common.gypi b/build/common.gypi index 1e76f75..200ef99 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -274,6 +274,11 @@ 'msvs_props': ['release.vsprops'], }], [ 'OS=="win"', { + 'msvs_configuration_attributes': { + 'OutputDirectory': '$(SolutionDir)$(ConfigurationName)', + 'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)', + 'CharacterSet': '1', + }, 'msvs_settings': { 'VCLinkerTool': { 'LinkIncremental': '1', @@ -291,6 +296,11 @@ 'PURIFY', 'NO_TCMALLOC', ], + 'msvs_configuration_attributes': { + 'OutputDirectory': '$(SolutionDir)$(ConfigurationName)', + 'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)', + 'CharacterSet': '1', + }, 'msvs_settings': { 'VCCLCompilerTool': { 'Optimization': '0', @@ -314,6 +324,11 @@ 'NDEBUG', 'NO_TCMALLOC', ], + 'msvs_configuration_attributes': { + 'OutputDirectory': '$(SolutionDir)$(ConfigurationName)', + 'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)', + 'CharacterSet': '1', + }, 'conditions': [ [ 'msvs_use_common_release', { 'configuration_platform': 'Win32', |