Merge branch 'master' into macos-premultiply-alpha

Cargo.toml

@@ -29,8 +29,8 @@ debug = true # required for `cargo flamegraph`, and makes `cargo-bloat` output s
 benchmark = [] # used to compile reference functions only needed for benchmarking against
 
 [dependencies]
-tray-icon = { version = "0.13", default-features = false }
-winit = "0.29"
+tray-icon = { version = "0.14", default-features = false }
+winit = "0.30"
 softbuffer = "0.4"
 serde = { version = "1", features = ["derive"] }
 toml = "0.8.12"
@@ -47,7 +47,7 @@ winapi = { version = "0.3", features = ["winuser", "windef", "minwindef"] }
 [target.'cfg(target_os = "linux")'.dependencies]
 gtk = "0.18" # must use this version of gtk because it's what tray-icon 0.10 needs
 
-[target.'cfg(target_os = "windows")'.build-dependencies]
+[build-dependencies]
 winres = "0.1"
 ico = "0.3"
 

MAINTENANCE.md

@@ -11,6 +11,12 @@ This document contains some common commands that I need to remember for package
 
 `cargo deny check`
 
+## Check & Lint
+
+To check all supported targets for compilation/lint errors, run:
+
+`cargo clippy --target x86_64-pc-windows-msvc --target x86_64-apple-darwin --target aarch64-apple-darwin --all-features`
+
 ## Tests
 
 `cargo test`

README.md

@@ -88,6 +88,6 @@ For suggestions, questions, or even just to say hey, feel free to start a [discu
 
 ## License
 
-Copyright 2023 [Michael Ripley](https://github.com/zkxs).
+Copyright 2023-2024 [Michael Ripley](https://github.com/zkxs).
 
 Simple Crosshair Overlay is provided under the [GPL-3.0 license](LICENSE).

build.rs

@@ -1,6 +1,6 @@
 // This file is part of simple-crosshair-overlay and is licenced under the GNU GPL v3.0.
 // See LICENSE file for full text.
-// Copyright © 2023 Michael Ripley
+// Copyright © 2023-2024 Michael Ripley
 
 use std::{env, fs, io};
 use std::io::{BufWriter, Write};
@@ -17,11 +17,11 @@ use std::process::Command;
 const TRAY_ICON_DIMENSION: u32 = 32;
 
 /// The sexy Windows .ico with the multiple size defined below adds ~26k to the binary.
-#[cfg(target_os = "windows")] const APP_ICON_DIMENSIONS: [u32; 5] = [16, 24, 32, 48, 64];
+const APP_ICON_DIMENSIONS: [u32; 5] = [16, 24, 32, 48, 64];
 
 static CONSTANTS_SOURCE_NAME: &str = "constants.rs";
 static TRAY_ICON_NAME: &str = "trayicon.argb";
-#[cfg(target_os = "windows")] static APP_ICON_NAME: &str = "app.ico";
+static APP_ICON_NAME: &str = "app.ico";
 static APP_NAME: &str = "Simple Crosshair Overlay";
 
 // Put in some indication that a build was in debug profile so there's a chance someone with the wrong build might one day notice
@@ -56,8 +56,7 @@ fn main() -> io::Result<()> {
     }
 
     // only generate Windows resource info on Windows.
-    #[cfg(target_os = "windows")]
-    {
+    if env::var("CARGO_CFG_TARGET_OS").unwrap() == "windows" {
         let icon_path = out_dir.join(APP_ICON_NAME);
         generate_file_if_not_cached(icon_path.as_path(), create_windows_app_icon_file)?;
 
@@ -138,7 +137,6 @@ fn create_tray_icon_file(path: &Path) -> io::Result<()> {
 }
 
 /// build a .ico file for windows
-#[cfg(target_os = "windows")]
 fn create_windows_app_icon_file(path: &Path) -> io::Result<()> {
     let mut icon_dir = ico::IconDir::new(ico::ResourceType::Icon);