diff options
| author | myd7349 <myd7349@gmail.com> | 2019-06-14 07:55:33 +0800 |
|---|---|---|
| committer | myd7349 <myd7349@gmail.com> | 2019-06-14 07:55:33 +0800 |
| commit | 1e9b8dd1b420aac64cbdd8bb905c02fa3c651b17 (patch) | |
| tree | 284efa9cf01657928d184e194a39e7cdee682e04 /toolsrc/src/vcpkg.cpp | |
| parent | 7cd35529736837e2e74dad231717bda76327ac79 (diff) | |
| parent | b03f62e0ebc1b5515bc8a1f41f3bfe9eca6589d4 (diff) | |
| download | vcpkg-1e9b8dd1b420aac64cbdd8bb905c02fa3c651b17.tar.gz vcpkg-1e9b8dd1b420aac64cbdd8bb905c02fa3c651b17.zip | |
Merge branch 'master' into rdkafka-init
Diffstat (limited to 'toolsrc/src/vcpkg.cpp')
| -rw-r--r-- | toolsrc/src/vcpkg.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/toolsrc/src/vcpkg.cpp b/toolsrc/src/vcpkg.cpp index 9102205d8..e02bdc71f 100644 --- a/toolsrc/src/vcpkg.cpp +++ b/toolsrc/src/vcpkg.cpp @@ -40,8 +40,10 @@ #include <memory> #include <random> +#if defined(_WIN32) #pragma comment(lib, "ole32") #pragma comment(lib, "shell32") +#endif using namespace vcpkg; @@ -388,6 +390,6 @@ int main(const int argc, const char* const* const argv) } fflush(stdout); - //It is expected that one of the sub-commands will exit cleanly before we get here. + // It is expected that one of the sub-commands will exit cleanly before we get here. Checks::exit_fail(VCPKG_LINE_INFO); } |
