tauri-apps/web-view
1
0
Fork 0
mirror of https://github.com/tauri-apps/web-view.git synced 2026-02-04 02:11:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix linked libraries

Browse Source 
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.
This commit is contained in:
zxey
2019-11-10 14:18:46 +01:00
parent 6c2ecbe4fa
commit 1ad5a55643
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
webview-sys/build.rs
View File

@@ -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);
}
}

5
webview-sys/webview_edge.cpp
View File

@@ -15,9 +15,10 @@
#include <winrt/Windows.Foundation.h>
#include <winrt/Windows.Web.UI.Interop.h>
#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);

5
webview-sys/webview_mshtml.c
View File

@@ -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)