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: http://src.chromium.org/svn/trunk/src/build@23698 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
Родитель
f215909caf
Коммит
b3017c6aad
15
common.gypi
15
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',
|
||||
|
|
Загрузка…
Ссылка в новой задаче