diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-20 12:43:47 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-20 12:43:47 +0000 |
| commit | 3e6bf353d760b275f095b9e1528082f53d5aff65 (patch) | |
| tree | dd631d83b3a1f62b9e30550d5948f1fa5272ac76 /tools | |
| parent | c6a01bbb7a8de2320f6d4c122b7179292475faec (diff) | |
| download | chromium_src-3e6bf353d760b275f095b9e1528082f53d5aff65.zip chromium_src-3e6bf353d760b275f095b9e1528082f53d5aff65.tar.gz chromium_src-3e6bf353d760b275f095b9e1528082f53d5aff65.tar.bz2 | |
Make GN write the platform for MSVS GYP files.
This also updates the base GN build to stay in sync with the GYP one.
Review URL: https://codereview.chromium.org/115723003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242078 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/gn/gyp_binary_target_writer.cc | 8 | ||||
| -rw-r--r-- | tools/gn/secondary/base/BUILD.gn | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/tools/gn/gyp_binary_target_writer.cc b/tools/gn/gyp_binary_target_writer.cc index 5797767..e32c60b 100644 --- a/tools/gn/gyp_binary_target_writer.cc +++ b/tools/gn/gyp_binary_target_writer.cc @@ -162,11 +162,15 @@ void GypBinaryTargetWriter::WriteVCConfiguration(int indent) { Indent(indent) << "'configurations': {\n"; Indent(indent + kExtraIndent) << "'Debug': {\n"; + Indent(indent + kExtraIndent * 2) << + "'msvs_configuration_platform': 'Win32',\n"; Flags debug_flags(FlagsFromTarget(group_.debug->item()->AsTarget())); WriteVCFlags(debug_flags, indent + kExtraIndent * 2); Indent(indent + kExtraIndent) << "},\n"; Indent(indent + kExtraIndent) << "'Release': {\n"; + Indent(indent + kExtraIndent * 2) << + "'msvs_configuration_platform': 'Win32',\n"; Flags release_flags(FlagsFromTarget(group_.release->item()->AsTarget())); WriteVCFlags(release_flags, indent + kExtraIndent * 2); Indent(indent + kExtraIndent) << "},\n"; @@ -175,6 +179,8 @@ void GypBinaryTargetWriter::WriteVCConfiguration(int indent) { // confused, but we ca leave them empty if there's no 64-bit target. Indent(indent + kExtraIndent) << "'Debug_x64': {\n"; if (group_.debug64) { + Indent(indent + kExtraIndent * 2) << + "'msvs_configuration_platform': 'x64',\n"; Flags flags(FlagsFromTarget(group_.debug64->item()->AsTarget())); WriteVCFlags(flags, indent + kExtraIndent * 2); } @@ -182,6 +188,8 @@ void GypBinaryTargetWriter::WriteVCConfiguration(int indent) { Indent(indent + kExtraIndent) << "'Release_x64': {\n"; if (group_.release64) { + Indent(indent + kExtraIndent * 2) << + "'msvs_configuration_platform': 'x64',\n"; Flags flags(FlagsFromTarget(group_.release64->item()->AsTarget())); WriteVCFlags(flags, indent + kExtraIndent * 2); } diff --git a/tools/gn/secondary/base/BUILD.gn b/tools/gn/secondary/base/BUILD.gn index 1e1ae32..2b2c2661 100644 --- a/tools/gn/secondary/base/BUILD.gn +++ b/tools/gn/secondary/base/BUILD.gn @@ -559,6 +559,7 @@ component("base") { "threading/thread_id_name_manager.h", "threading/thread_local.h", "threading/thread_local_posix.cc", + "threading/thread_local_storage.cc", "threading/thread_local_storage.h", "threading/thread_local_storage_posix.cc", "threading/thread_local_storage_win.cc", |