diff options
| author | Kirill Chibisov <contact@kchibisov.com> | 2020-03-13 03:33:12 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-13 03:33:12 +0300 |
| commit | 4000ec04d89b9bd77995960d2a9da8fcad55e003 (patch) | |
| tree | 0e38be94eb1d75d70d5dcec7e676c699f3de29a2 /alacritty | |
| parent | 6d60a49956facc63ab5e0ebac8eb15ab7347ea9a (diff) | |
| download | r-alacritty-4000ec04d89b9bd77995960d2a9da8fcad55e003.tar.gz r-alacritty-4000ec04d89b9bd77995960d2a9da8fcad55e003.tar.bz2 r-alacritty-4000ec04d89b9bd77995960d2a9da8fcad55e003.zip | |
Add option to pick Linux/BSD backends
This commit adds two cargo features `x11` and `wayland` to pick
Linux/BSD backends, with both enabled by default.
Fixes #3340.
Diffstat (limited to 'alacritty')
| -rw-r--r-- | alacritty/Cargo.toml | 6 | ||||
| -rw-r--r-- | alacritty/build.rs | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/alacritty/Cargo.toml b/alacritty/Cargo.toml index b68d10e0..05574363 100644 --- a/alacritty/Cargo.toml +++ b/alacritty/Cargo.toml @@ -9,7 +9,7 @@ homepage = "https://github.com/alacritty/alacritty" edition = "2018" [dependencies] -alacritty_terminal = { path = "../alacritty_terminal" } +alacritty_terminal = { path = "../alacritty_terminal", default-features = false } clap = "2" log = "0.4" time = "0.1.40" @@ -49,7 +49,9 @@ winapi = { version = "0.3.7", features = ["impl-default", "wincon"]} embed-resource = "1.3" [features] -default = [] +default = ["wayland", "x11"] +x11 = ["alacritty_terminal/x11"] +wayland = ["alacritty_terminal/wayland"] # Enabling this feature makes shaders automatically reload when changed live-shader-reload = [] nightly = [] diff --git a/alacritty/build.rs b/alacritty/build.rs index 16f3a2b3..b2ee8b6e 100644 --- a/alacritty/build.rs +++ b/alacritty/build.rs @@ -22,6 +22,10 @@ use std::path::Path; use embed_resource; fn main() { + if cfg!(not(any(feature = "x11", feature = "wayland", target_os = "macos", windows))) { + panic!("at least one of the \"x11\"/\"wayland\" features must be enabled"); + } + let hash = rustc_tools_util::get_commit_hash().unwrap_or_default(); println!("cargo:rustc-env=GIT_HASH={}", hash); |