diff options
| author | Barath Kannan <barathsotd@gmail.com> | 2018-01-17 19:00:43 +1100 |
|---|---|---|
| committer | Barath Kannan <barathsotd@gmail.com> | 2018-01-17 19:00:43 +1100 |
| commit | c30363d07b3f64b5f38531442ea92d9c1cf81d13 (patch) | |
| tree | 8a169a2a0aadf40dad50e73d226c3eca1e949327 /toolsrc/include | |
| parent | 47189e90d59459be69d4f6a0b039849913031c8e (diff) | |
| parent | 28c5c6ae4601c323cbd57a13da03b9047dc282ad (diff) | |
| download | vcpkg-c30363d07b3f64b5f38531442ea92d9c1cf81d13.tar.gz vcpkg-c30363d07b3f64b5f38531442ea92d9c1cf81d13.zip | |
Merge branch 'master' into qt5_modular
Diffstat (limited to 'toolsrc/include')
| -rw-r--r-- | toolsrc/include/vcpkg/commands.h | 2 | ||||
| -rw-r--r-- | toolsrc/include/vcpkg/triplet.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/toolsrc/include/vcpkg/commands.h b/toolsrc/include/vcpkg/commands.h index c82f504e0..31c750b38 100644 --- a/toolsrc/include/vcpkg/commands.h +++ b/toolsrc/include/vcpkg/commands.h @@ -119,7 +119,7 @@ namespace vcpkg::Commands namespace Hash { - void perform_and_exit(const VcpkgCmdArguments& args); + void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths); } template<class T> diff --git a/toolsrc/include/vcpkg/triplet.h b/toolsrc/include/vcpkg/triplet.h index 2cfc2d02a..10464dc2c 100644 --- a/toolsrc/include/vcpkg/triplet.h +++ b/toolsrc/include/vcpkg/triplet.h @@ -18,6 +18,9 @@ namespace vcpkg static const Triplet X86_UWP; static const Triplet X64_UWP; static const Triplet ARM_UWP; + static const Triplet ARM64_UWP; + static const Triplet ARM_WINDOWS; + static const Triplet ARM64_WINDOWS; const std::string& canonical_name() const; const std::string& to_string() const; |