Merge branch 'main' of git.g4b.org:g4borg/soundboard
This commit is contained in:
commit
543ea46ad0
5869
Cargo.lock
generated
5869
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -22,7 +22,7 @@ serde = { version = "1.0.171", features = ["derive"] }
|
|||||||
tokio = { version = "1.29.1", features = ["full"] }
|
tokio = { version = "1.29.1", features = ["full"] }
|
||||||
xxhash-rust = { version = "0.8.6", features = ["xxh3", "const_xxh3"] }
|
xxhash-rust = { version = "0.8.6", features = ["xxh3", "const_xxh3"] }
|
||||||
eframe = "0.27.2"
|
eframe = "0.27.2"
|
||||||
tray-item = "0.10"
|
tray-item = { version = "0.10", features = ["ksni"] }
|
||||||
once_cell = "1.19.0"
|
once_cell = "1.19.0"
|
||||||
raw-window-handle = "0.6.2"
|
raw-window-handle = "0.6.2"
|
||||||
image = "0.25.1"
|
image = "0.25.1"
|
||||||
|
3
build.rs
3
build.rs
@ -2,7 +2,8 @@
|
|||||||
extern crate embed_resource;
|
extern crate embed_resource;
|
||||||
|
|
||||||
fn main() {
|
fn main() {
|
||||||
if cfg!(target_os = "windows") {
|
#[cfg(windows)]
|
||||||
|
{
|
||||||
embed_resource::compile("soundboard.rc", embed_resource::NONE);
|
embed_resource::compile("soundboard.rc", embed_resource::NONE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
#[cfg(not(windows))]
|
#[cfg(not(windows))]
|
||||||
pub fn load_app_icon(_icon_name: &str) -> eframe::egui::IconData {
|
pub fn load_app_icon(_icon_name: &str) -> eframe::egui::IconData {
|
||||||
let (icon_rgba, icon_width, icon_height) = {
|
let (icon_rgba, icon_width, icon_height) = {
|
||||||
let icon = include_bytes!("../../icons/soundboard.ico");
|
let icon = include_bytes!("../icons/soundboard.ico");
|
||||||
let image = image::load_from_memory(icon)
|
let image = image::load_from_memory(icon)
|
||||||
.expect("Failed to open icon path")
|
.expect("Failed to open icon path")
|
||||||
.into_rgba8();
|
.into_rgba8();
|
||||||
|
Loading…
Reference in New Issue
Block a user