Commit 3e6bf353 authored by brettw@chromium.org's avatar brettw@chromium.org

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
parent c6a01bbb
......@@ -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);
}
......
......@@ -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",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment