diff options
Diffstat (limited to 'alacritty/src')
| -rw-r--r-- | alacritty/src/renderer/mod.rs | 20 | ||||
| -rw-r--r-- | alacritty/src/window.rs | 2 |
2 files changed, 9 insertions, 13 deletions
diff --git a/alacritty/src/renderer/mod.rs b/alacritty/src/renderer/mod.rs index 58d43406..79df6b34 100644 --- a/alacritty/src/renderer/mod.rs +++ b/alacritty/src/renderer/mod.rs @@ -35,20 +35,16 @@ use crate::renderer::rects::RenderRect; pub mod rects; // Shader paths for live reload. -static TEXT_SHADER_F_PATH: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/../res/text.f.glsl"); -static TEXT_SHADER_V_PATH: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/../res/text.v.glsl"); -static RECT_SHADER_F_PATH: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/../res/rect.f.glsl"); -static RECT_SHADER_V_PATH: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/../res/rect.v.glsl"); +static TEXT_SHADER_F_PATH: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/res/text.f.glsl"); +static TEXT_SHADER_V_PATH: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/res/text.v.glsl"); +static RECT_SHADER_F_PATH: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/res/rect.f.glsl"); +static RECT_SHADER_V_PATH: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/res/rect.v.glsl"); // Shader source which is used when live-shader-reload feature is disable. -static TEXT_SHADER_F: &str = - include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/../res/text.f.glsl")); -static TEXT_SHADER_V: &str = - include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/../res/text.v.glsl")); -static RECT_SHADER_F: &str = - include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/../res/rect.f.glsl")); -static RECT_SHADER_V: &str = - include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/../res/rect.v.glsl")); +static TEXT_SHADER_F: &str = include_str!("../../res/text.f.glsl"); +static TEXT_SHADER_V: &str = include_str!("../../res/text.v.glsl"); +static RECT_SHADER_F: &str = include_str!("../../res/rect.f.glsl"); +static RECT_SHADER_V: &str = include_str!("../../res/rect.v.glsl"); /// `LoadGlyph` allows for copying a rasterized glyph into graphics memory. pub trait LoadGlyph { diff --git a/alacritty/src/window.rs b/alacritty/src/window.rs index 6659a9e0..172d5acc 100644 --- a/alacritty/src/window.rs +++ b/alacritty/src/window.rs @@ -42,7 +42,7 @@ use crate::gl; // It's required to be in this directory due to the `windows.rc` file. #[cfg(not(any(target_os = "macos", windows)))] -static WINDOW_ICON: &[u8] = include_bytes!("../../extra/windows/alacritty.ico"); +static WINDOW_ICON: &[u8] = include_bytes!("../alacritty.ico"); // This should match the definition of IDI_ICON from `windows.rc`. #[cfg(windows)] |