diff options
| author | sterlingjensen <5555776+sterlingjensen@users.noreply.github.com> | 2019-11-30 00:11:43 -0600 |
|---|---|---|
| committer | Christian Duerr <contact@christianduerr.com> | 2019-11-30 07:11:43 +0100 |
| commit | 5f98de46921a878bc13397859eadd7ed4f7c2b44 (patch) | |
| tree | d68792f98448a52e6816d420856d446c79aae3f5 /alacritty | |
| parent | 0d637a096a53a0b8da2cfb6a8d8a0050cc4f2b34 (diff) | |
| download | r-alacritty-5f98de46921a878bc13397859eadd7ed4f7c2b44.tar.gz r-alacritty-5f98de46921a878bc13397859eadd7ed4f7c2b44.tar.bz2 r-alacritty-5f98de46921a878bc13397859eadd7ed4f7c2b44.zip | |
Move icon embed step from winpty to Alacritty
Diffstat (limited to 'alacritty')
| -rw-r--r-- | alacritty/Cargo.toml | 5 | ||||
| -rw-r--r-- | alacritty/build.rs | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/alacritty/Cargo.toml b/alacritty/Cargo.toml index 647a35e6..9b1cfbe8 100644 --- a/alacritty/Cargo.toml +++ b/alacritty/Cargo.toml @@ -34,7 +34,7 @@ rustc_tools_util = "0.2.0" xdg = "2" [target.'cfg(not(target_os = "macos"))'.dependencies] -image = "0.22.3" +image = { version = "0.22.3", default-features = false, features = ["ico"] } [target.'cfg(any(target_os = "macos", windows))'.dependencies] dirs = "2.0.2" @@ -45,6 +45,9 @@ x11-dl = "2" [target.'cfg(windows)'.dependencies] winapi = { version = "0.3.7", features = ["impl-default", "winuser", "synchapi", "roerrorapi", "winerror", "wincon", "wincontypes"]} +[target.'cfg(windows)'.build-dependencies] +embed-resource = "1.3" + [features] default = [] # Enabling this feature makes shaders automatically reload when changed diff --git a/alacritty/build.rs b/alacritty/build.rs index 3c58b0cf..16f3a2b3 100644 --- a/alacritty/build.rs +++ b/alacritty/build.rs @@ -18,6 +18,9 @@ use std::env; use std::fs::File; use std::path::Path; +#[cfg(windows)] +use embed_resource; + fn main() { let hash = rustc_tools_util::get_commit_hash().unwrap_or_default(); println!("cargo:rustc-env=GIT_HASH={}", hash); @@ -28,4 +31,7 @@ fn main() { Registry::new(Api::Gl, (4, 5), Profile::Core, Fallbacks::All, ["GL_ARB_blend_func_extended"]) .write_bindings(GlobalGenerator, &mut file) .unwrap(); + + #[cfg(windows)] + embed_resource::compile("../extra/windows/windows.rc"); } |