From f2f814ed4639b89fddeab4318100d4f3b711f5d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= Date: Fri, 29 Nov 2024 13:43:40 +0100 Subject: [PATCH] Update to embed-resource 3.0 (fixes build below windows \?\ path) (#21288) Accd'g to https://github.com/zed-industries/zed/pull/9009#issuecomment-1983599232 the manifest is required Followup for https://github.com/nabijaczleweli/rust-embed-resource/issues/71 Release Notes: - N/A --- crates/gpui/Cargo.toml | 2 +- crates/gpui/build.rs | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml index 347e5502ca39d..ed523c769ac63 100644 --- a/crates/gpui/Cargo.toml +++ b/crates/gpui/Cargo.toml @@ -119,7 +119,7 @@ http_client = { workspace = true, features = ["test-support"] } unicode-segmentation.workspace = true [build-dependencies] -embed-resource = "2.4" +embed-resource = "3.0" [target.'cfg(target_os = "macos")'.build-dependencies] bindgen = "0.70.0" diff --git a/crates/gpui/build.rs b/crates/gpui/build.rs index 5a015106c722a..ef29d7cc8222a 100644 --- a/crates/gpui/build.rs +++ b/crates/gpui/build.rs @@ -18,7 +18,9 @@ fn main() { let rc_file = std::path::Path::new("resources/windows/gpui.rc"); println!("cargo:rerun-if-changed={}", manifest.display()); println!("cargo:rerun-if-changed={}", rc_file.display()); - embed_resource::compile(rc_file, embed_resource::NONE); + embed_resource::compile(rc_file, embed_resource::NONE) + .manifest_required() + .unwrap(); } _ => (), };