From 39670fc9c094b9198f8c928ed4e4705aac16d6e2 Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Sun, 17 Jun 2018 15:18:25 -0700 Subject: [PATCH] libuv: Add pragmas for win32 libraries. --- wpiutil/src/main/native/libuv/win/fs.cpp | 1 + wpiutil/src/main/native/libuv/win/tty.cpp | 2 ++ wpiutil/src/main/native/libuv/win/util.cpp | 6 ++++++ wpiutil/src/main/native/libuv/win/winsock.cpp | 2 ++ 4 files changed, 11 insertions(+) diff --git a/wpiutil/src/main/native/libuv/win/fs.cpp b/wpiutil/src/main/native/libuv/win/fs.cpp index c007b35967..d7698a7e9b 100644 --- a/wpiutil/src/main/native/libuv/win/fs.cpp +++ b/wpiutil/src/main/native/libuv/win/fs.cpp @@ -37,6 +37,7 @@ #include +#pragma comment(lib, "Advapi32.lib") #define UV_FS_FREE_PATHS 0x0002 #define UV_FS_FREE_PTR 0x0008 diff --git a/wpiutil/src/main/native/libuv/win/tty.cpp b/wpiutil/src/main/native/libuv/win/tty.cpp index 8efeda330d..4ac21b6310 100644 --- a/wpiutil/src/main/native/libuv/win/tty.cpp +++ b/wpiutil/src/main/native/libuv/win/tty.cpp @@ -40,6 +40,8 @@ #include "stream-inl.h" #include "req-inl.h" +#pragma comment(lib, "User32.lib") + #ifndef InterlockedOr # define InterlockedOr _InterlockedOr #endif diff --git a/wpiutil/src/main/native/libuv/win/util.cpp b/wpiutil/src/main/native/libuv/win/util.cpp index 424154fdca..1917c02a85 100644 --- a/wpiutil/src/main/native/libuv/win/util.cpp +++ b/wpiutil/src/main/native/libuv/win/util.cpp @@ -74,6 +74,12 @@ static char *process_title; static CRITICAL_SECTION process_title_lock; +#pragma comment(lib, "Advapi32.lib") +#pragma comment(lib, "IPHLPAPI.lib") +#pragma comment(lib, "Psapi.lib") +#pragma comment(lib, "Userenv.lib") +#pragma comment(lib, "kernel32.lib") + /* Interval (in seconds) of the high-resolution clock. */ static double hrtime_interval_ = 0; diff --git a/wpiutil/src/main/native/libuv/win/winsock.cpp b/wpiutil/src/main/native/libuv/win/winsock.cpp index 5e7da2a8f2..f4172e2c01 100644 --- a/wpiutil/src/main/native/libuv/win/winsock.cpp +++ b/wpiutil/src/main/native/libuv/win/winsock.cpp @@ -26,6 +26,8 @@ #include "internal.h" +#pragma comment(lib, "Ws2_32.lib") + /* Whether there are any non-IFS LSPs stacked on TCP */ int uv_tcp_non_ifs_lsp_ipv4; int uv_tcp_non_ifs_lsp_ipv6;