From 92757ea70ca03c22b64991cae7ea053cbc91d756 Mon Sep 17 00:00:00 2001 From: j4qfrost Date: Mon, 25 May 2020 15:35:04 -0700 Subject: [PATCH] Build deps (#292) * remove sdl-sys build-dep; segregate windows dep * match version * linux and windows need sdl-sys build --- Cargo.lock | 14 +++++++------- Cargo.toml | 10 +++++----- build.rs | 3 ++- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 05254ee..6956ec3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -635,9 +635,9 @@ checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" [[package]] name = "encoding_rs" -version = "0.8.22" +version = "0.8.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd8d03faa7fe0c1431609dfad7bbe827af30f82e1e2ae6f7ee4fca6bd764bc28" +checksum = "e8ac63f94732332f44fe654443c46f6375d1939684c17b0afb6cb56b0456e171" dependencies = [ "cfg-if", ] @@ -1316,7 +1316,7 @@ dependencies = [ [[package]] name = "neovide" -version = "0.5.0" +version = "0.6.0" dependencies = [ "anyhow", "async-trait", @@ -1955,9 +1955,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "sdl2" -version = "0.33.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f74124048ea86b5cd50236b2443f6f57cf4625a8e8818009b4e50dbb8729a43" +checksum = "6693f362118c0cd32858fe33a14d74cc3111bbc3a7de1aee88e5289fd9289f97" dependencies = [ "bitflags", "lazy_static", @@ -1967,9 +1967,9 @@ dependencies = [ [[package]] name = "sdl2-sys" -version = "0.33.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e1deb61ff274d29fb985017d4611d4004b113676eaa9c06754194caf82094e" +checksum = "575db20c45cce6565d4ece46509288ded53f5571dc89e4af165a562eb0eeec26" dependencies = [ "cfg-if", "cmake", diff --git a/Cargo.toml b/Cargo.toml index ea8f367..445bee0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -39,12 +39,12 @@ rand = "0.7" [target.'cfg(windows)'.dependencies] winapi = "0.3.8" -[build-dependencies] +[target.'cfg(windows)'.build-dependencies] winres = "0.1.11" -sdl2-sys = { version = "0.33", default-features = false, features = ["bundled", "static-link"] } +sdl2-sys = { version = "0.34", default-features = false, features = ["bundled", "static-link"] } -# [patch.crates-io] -# sdl2 = { git = "https://github.com/Rust-SDL2/rust-sdl2", default-features = false } +[target.'cfg(macos)'.build-dependencies] +sdl2-sys = { version = "0.34", default-features = false, features = ["bundled", "static-link"] } [profile.release] debug = true @@ -55,7 +55,7 @@ incremental = true name = "Neovide" identifier = "com.kethku.neovide" icon = ["assets/nvim.ico"] -version = "0.4.0" +version = "0.6.0" resources = [] copyright = "Copyright (c) keith 2020. All rights reserved." category = "Productivity" diff --git a/build.rs b/build.rs index 5503199..4d408bc 100644 --- a/build.rs +++ b/build.rs @@ -1,5 +1,6 @@ fn main() { - if cfg!(target_os = "windows") { + #[cfg(windows)] + { let mut res = winres::WindowsResource::new(); res.set_icon("assets/nvim.ico"); res.compile().expect("Could not attach exe icon");