| Index: build/common.gypi
|
| ===================================================================
|
| --- build/common.gypi (revision 24385)
|
| +++ build/common.gypi (working copy)
|
| @@ -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'],
|
| }],
|
| ],
|
|
|