helios/helios-remote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: improve winres icon embedding, log success/failure, auto-detect windres path

Browse source
This commit is contained in:
Helios 2026-03-06 03:51:02 +01:00
parent 00380e07f3
commit 716d10e87c
No known key found for this signature in database
GPG key ID: C8259547CD8309B5
1 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

23
crates/client/build.rs
View file

@ -11,12 +11,29 @@ fn main() {
// Embed Windows icon when cross-compiling for Windows // Embed Windows icon when cross-compiling for Windows
if std::env::var("CARGO_CFG_TARGET_OS").as_deref() == Ok("windows") { if std::env::var("CARGO_CFG_TARGET_OS").as_deref() == Ok("windows") {
// Find windres: prefer arch-prefixed, fall back to plain windres
let windres = if std::process::Command::new("x86_64-w64-mingw32-windres")
.arg("--version")
.output()
.is_ok()
{
"x86_64-w64-mingw32-windres"
} else {
"windres"
};
let mut res = winres::WindowsResource::new(); let mut res = winres::WindowsResource::new();
res.set_icon("../../assets/icon.ico"); res.set_icon("../../assets/icon.ico");
// Set cross-compile toolkit (mingw-w64)
res.set_toolkit_path("/usr"); res.set_toolkit_path("/usr");
res.set_windres_path("x86_64-w64-mingw32-windres"); res.set_windres_path(windres);
res.set_ar_path("x86_64-w64-mingw32-ar"); res.set_ar_path("x86_64-w64-mingw32-ar");
res.compile().unwrap_or_else(|e| eprintln!("winres warning: {e}"));
match res.compile() {
Ok(_) => println!("cargo:warning=Icon embedded successfully via {windres}"),
Err(e) => {
println!("cargo:warning=winres failed: {e}");
println!("cargo:warning=windres path used: {windres}");
}
}
} }
} }