aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/include
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2017-01-24 14:55:38 -0800
committerRobert Schumacher <roschuma@microsoft.com>2017-01-24 14:55:38 -0800
commitd98d7b386dc894ff1aaf620900c8b5a96aa1836b (patch)
treeb41834e3d524c96db977124f4832858f93d51324 /toolsrc/include
parentc09e6ff69ac353cee7538d073e9c35dfef392836 (diff)
parente3c3497dbc03607492f38e54122106bc8f00ca20 (diff)
downloadvcpkg-d98d7b386dc894ff1aaf620900c8b5a96aa1836b.tar.gz
vcpkg-d98d7b386dc894ff1aaf620900c8b5a96aa1836b.zip
Merge branch 'master' of https://github.com/microsoft/vcpkg
Diffstat (limited to 'toolsrc/include')
-rw-r--r--toolsrc/include/vcpkg_Environment.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/toolsrc/include/vcpkg_Environment.h b/toolsrc/include/vcpkg_Environment.h
index 9161f7ce5..e4dd47472 100644
--- a/toolsrc/include/vcpkg_Environment.h
+++ b/toolsrc/include/vcpkg_Environment.h
@@ -17,5 +17,11 @@ namespace vcpkg::Environment
const fs::path& get_dumpbin_exe(const vcpkg_paths& paths);
- const fs::path& get_vcvarsall_bat(const vcpkg_paths& paths);
+ struct vcvarsall_and_platform_toolset
+ {
+ fs::path path;
+ std::wstring platform_toolset;
+ };
+
+ const vcvarsall_and_platform_toolset& get_vcvarsall_bat(const vcpkg_paths& paths);
}