open.source/espanso
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(ui): add feature to avoid double linking gdiplus

Browse Source
This commit is contained in:
Federico Terzi 2021-05-21 22:00:02 +02:00
parent ccb3e11d93
commit 04720212e5
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
espanso-ui/Cargo.toml
View File

@ -5,6 +5,11 @@ authors = ["Federico Terzi <federico-terzi@users.noreply.github.com>"]
edition = "2018" edition = "2018"
build="build.rs" build="build.rs"
[features]
# If enabled, avoid linking with the gdiplus library on Windows, which
# might conflict with wxWidgets
avoid-gdi = []
[dependencies] [dependencies]
log = "0.4.14" log = "0.4.14"
serde_json = "1.0.61" serde_json = "1.0.61"

6
espanso-ui/build.rs
View File

@ -34,8 +34,10 @@ fn cc_config() {
println!("cargo:rustc-link-lib=dylib=user32"); println!("cargo:rustc-link-lib=dylib=user32");
#[cfg(target_env = "gnu")] #[cfg(target_env = "gnu")]
println!("cargo:rustc-link-lib=dylib=stdc++"); println!("cargo:rustc-link-lib=dylib=stdc++");
#[cfg(target_env = "gnu")]
println!("cargo:rustc-link-lib=dylib=gdiplus"); if cfg!(not(feature = "avoid-gdi")) {
println!("cargo:rustc-link-lib=dylib=gdiplus");
}
} }
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]

1
espanso-ui/src/win32/native.cpp
View File

@ -41,7 +41,6 @@
#pragma comment(lib, "Shell32.lib") #pragma comment(lib, "Shell32.lib")
#include <shellapi.h> #include <shellapi.h>
#pragma comment(lib, "Gdi32.lib")
#include <Windows.h> #include <Windows.h>
#include "WinToast/wintoastlib.h" #include "WinToast/wintoastlib.h"