diff --git a/Cargo.toml b/Cargo.toml index f46d32a53c..a3eeb2d653 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -181,6 +181,10 @@ wasmtime = "16" tree-sitter = { git = "https://github.com/tree-sitter/tree-sitter", rev = "1d8975319c2d5de1bf710e7e21db25b0eee4bc66" } wasmtime = { git = "https://github.com/bytecodealliance/wasmtime", rev = "v16.0.0" } +# TODO - Remove when corresponding Blade versions are published +blade-graphics = { path = "/x/Code/blade/blade-graphics" } +blade-macros = { path = "/x/Code/blade/blade-macros" } + [profile.dev] split-debuginfo = "unpacked" debug = "limited" diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml index d790644e99..aa5ff1dcc3 100644 --- a/crates/cli/Cargo.toml +++ b/crates/cli/Cargo.toml @@ -23,6 +23,6 @@ serde_derive.workspace = true util = { path = "../util" } [target.'cfg(target_os = "macos")'.dependencies] -core-foundation = "0.9" -core-services = "0.2" -plist = "1.3" +#core-foundation = "0.9" +#core-services = "0.2" +#plist = "1.3" diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml index 96c7b4b02c..15e3e8d5c9 100644 --- a/crates/gpui/Cargo.toml +++ b/crates/gpui/Cargo.toml @@ -26,6 +26,8 @@ anyhow.workspace = true async-task = "4.7" backtrace = { version = "0.3", optional = true } bitflags = "2.4.0" +blade-graphics = "0.3" +blade-macros = "0.2" collections = { path = "../collections" } ctor.workspace = true derive_more.workspace = true diff --git a/crates/gpui/build.rs b/crates/gpui/build.rs index 4c86fe9a62..a70f4fb637 100644 --- a/crates/gpui/build.rs +++ b/crates/gpui/build.rs @@ -6,12 +6,12 @@ use std::{ use cbindgen::Config; fn main() { - generate_dispatch_bindings(); + //generate_dispatch_bindings(); let header_path = generate_shader_bindings(); - #[cfg(feature = "runtime_shaders")] - emit_stitched_shaders(&header_path); - #[cfg(not(feature = "runtime_shaders"))] - compile_metal_shaders(&header_path); + //#[cfg(feature = "runtime_shaders")] + //emit_stitched_shaders(&header_path); + //#[cfg(not(feature = "runtime_shaders"))] + //compile_metal_shaders(&header_path); } fn generate_dispatch_bindings() { diff --git a/crates/gpui/src/gpui.rs b/crates/gpui/src/gpui.rs index 4fe5f62111..4fa2f525a7 100644 --- a/crates/gpui/src/gpui.rs +++ b/crates/gpui/src/gpui.rs @@ -6,8 +6,7 @@ //! ## Getting Started //! //! GPUI is still in active development as we work on the Zed code editor and isn't yet on crates.io. -//! You'll also need to use the latest version of stable rust and be on macOS. Add the following to your -//! Cargo.toml: +//! You'll also need to use the latest version of stable rust. Add the following to your Cargo.toml: //! //! ``` //! gpui = { git = "https://github.com/zed-industries/zed" } diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 5cdc76def2..af32046cb1 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -2,4 +2,4 @@ channel = "1.75" profile = "minimal" components = [ "rustfmt", "clippy" ] -targets = [ "x86_64-apple-darwin", "aarch64-apple-darwin", "wasm32-wasi" ] +targets = [ "x86_64-apple-darwin", "aarch64-apple-darwin", "x86_64-linux-gnu", "wasm32-wasi" ]