diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-28 00:02:51 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-28 00:02:51 +0000 |
| commit | 534303c6f1f0479c73850f115da75c03e05f87e5 (patch) | |
| tree | 9195dd9c66692591f219dc784ca9d34d10ff6a62 /build | |
| parent | 7705e21ff5975c739d41765b031d8dcacf1ec6d1 (diff) | |
| download | chromium_src-534303c6f1f0479c73850f115da75c03e05f87e5.zip chromium_src-534303c6f1f0479c73850f115da75c03e05f87e5.tar.gz chromium_src-534303c6f1f0479c73850f115da75c03e05f87e5.tar.bz2 | |
Add a gyp variable build_dir_prefix to control the output
directory of the build on Windows.
BUG=97678
Review URL: http://codereview.chromium.org/8046024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103054 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi index b0c09e1..0bd9b08 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -1185,6 +1185,12 @@ ], # target_conditions for 'target_defaults' 'default_configuration': 'Debug', 'configurations': { + 'variables' : { + # Only used by Windows build for now. Can be used to build into a + # differet output directory, e.g., a build_dir_prefix of VS2010_ would + # output files in src/build/VS2010_{Debug,Release}. + 'build_dir_prefix%': '', + }, # VCLinkerTool LinkIncremental values below: # 0 == default # 1 == /INCREMENTAL:NO @@ -1196,7 +1202,7 @@ 'Common_Base': { 'abstract': 1, 'msvs_configuration_attributes': { - 'OutputDirectory': '<(DEPTH)\\build\\$(ConfigurationName)', + 'OutputDirectory': '<(DEPTH)\\build\\<(build_dir_prefix)$(ConfigurationName)', 'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)', 'CharacterSet': '1', }, |