From 1ad5a55643f9c58415286858a3d2b14cc53981f5 Mon Sep 17 00:00:00 2001 From: zxey Date: Sun, 10 Nov 2019 14:18:46 +0100 Subject: [PATCH] Fix linked libraries Added missing linked libraries to edge backend. I also kept the pragmas, if someone want to build the backends separately, so they do not have to supply link library flags to msvc. --- webview-sys/build.rs | 6 +++++- webview-sys/webview_edge.cpp | 5 +++-- webview-sys/webview_mshtml.c | 5 ++++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/webview-sys/build.rs b/webview-sys/build.rs index 7c177d6..8591a94 100644 --- a/webview-sys/build.rs +++ b/webview-sys/build.rs @@ -26,10 +26,14 @@ fn main() { build .file("webview_edge.cpp") .flag_if_supported("/std:c++17"); + + for &lib in &["windowsapp", "user32", "gdi32", "ole32"] { + println!("cargo:rustc-link-lib={}", lib); + } } else { build.file("webview_mshtml.c"); - for &lib in &["ole32", "comctl32", "oleaut32", "uuid", "gdi32"] { + for &lib in &["ole32", "comctl32", "oleaut32", "uuid", "gdi32", "user32"] { println!("cargo:rustc-link-lib={}", lib); } } diff --git a/webview-sys/webview_edge.cpp b/webview-sys/webview_edge.cpp index 2b46eae..cda76c3 100644 --- a/webview-sys/webview_edge.cpp +++ b/webview-sys/webview_edge.cpp @@ -15,9 +15,10 @@ #include #include -#pragma comment(lib, "windowsapp") +#pragma comment(lib, "windowsapp.lib") #pragma comment(lib, "user32.lib") -#pragma comment(lib, "gdi32") +#pragma comment(lib, "gdi32.lib") +#pragma comment(lib, "ole32.lib") static inline BSTR webview_to_bstr(const char *s) { DWORD size = MultiByteToWideChar(CP_UTF8, 0, s, -1, 0, 0); diff --git a/webview-sys/webview_mshtml.c b/webview-sys/webview_mshtml.c index 88b5f81..c563bca 100644 --- a/webview-sys/webview_mshtml.c +++ b/webview-sys/webview_mshtml.c @@ -70,9 +70,12 @@ WEBVIEW_API webview_t webview_new(const char* title, const char* url, int width, return wv; } -#pragma comment(lib, "user32.lib") #pragma comment(lib, "ole32.lib") +#pragma comment(lib, "comctl32.lib") #pragma comment(lib, "oleaut32.lib") +#pragma comment(lib, "uuid.lib") +#pragma comment(lib, "gdi32.lib") +#pragma comment(lib, "user32.lib") #define WM_WEBVIEW_DISPATCH (WM_APP + 1)