Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

gpui: Fix manifest path for cross-compilation (#62525)

zooeywmc24e309d935d
diff --git a/crates/gpui/build.rs b/crates/gpui/build.rs
index b1bfd2194f5..79ca3f96a73 100644
--- a/crates/gpui/build.rs
+++ b/crates/gpui/build.rs
@@ -13,11 +13,12 @@ fn main() {
#[cfg(feature = "windows-manifest")]
fn embed_resource() {
- let manifest = std::path::Path::new("resources/windows/gpui.manifest.xml");
- let rc_file = std::path::Path::new("resources/windows/gpui.rc");
+ let resource_dir = std::path::Path::new("resources/windows");
+ let manifest = resource_dir.join("gpui.manifest.xml");
+ let rc_file = resource_dir.join("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::ParamsIncludeDirs([resource_dir]))
.manifest_required()
.unwrap();
}
diff --git a/crates/gpui/resources/windows/gpui.rc b/crates/gpui/resources/windows/gpui.rc
index a6f37877e80..ab209572f88 100644
--- a/crates/gpui/resources/windows/gpui.rc
+++ b/crates/gpui/resources/windows/gpui.rc
@@ -1,2 +1,2 @@
#define RT_MANIFEST 24
-1 RT_MANIFEST "resources/windows/gpui.manifest.xml"
\ No newline at end of file
+1 RT_MANIFEST "gpui.manifest.xml"