zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-19 10:29:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add blade dependency

Browse Source
This commit is contained in:
Dzmitry Malyshau 2024-01-24 21:19:46 -08:00
parent 69e0ea92e4
commit ef4ef5f0e8
6 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.toml
View File

@ -181,6 +181,10 @@ wasmtime = "16"
tree-sitter = { git = "https://github.com/tree-sitter/tree-sitter", rev = "1d8975319c2d5de1bf710e7e21db25b0eee4bc66" } tree-sitter = { git = "https://github.com/tree-sitter/tree-sitter", rev = "1d8975319c2d5de1bf710e7e21db25b0eee4bc66" }
wasmtime = { git = "https://github.com/bytecodealliance/wasmtime", rev = "v16.0.0" } 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] [profile.dev]
split-debuginfo = "unpacked" split-debuginfo = "unpacked"
debug = "limited" debug = "limited"

6
crates/cli/Cargo.toml
View File

@ -23,6 +23,6 @@ serde_derive.workspace = true
util = { path = "../util" } util = { path = "../util" }
[target.'cfg(target_os = "macos")'.dependencies] [target.'cfg(target_os = "macos")'.dependencies]
core-foundation = "0.9" #core-foundation = "0.9"
core-services = "0.2" #core-services = "0.2"
plist = "1.3" #plist = "1.3"

2
crates/gpui/Cargo.toml
View File

@ -26,6 +26,8 @@ anyhow.workspace = true
async-task = "4.7" async-task = "4.7"
backtrace = { version = "0.3", optional = true } backtrace = { version = "0.3", optional = true }
bitflags = "2.4.0" bitflags = "2.4.0"
blade-graphics = "0.3"
blade-macros = "0.2"
collections = { path = "../collections" } collections = { path = "../collections" }
ctor.workspace = true ctor.workspace = true
derive_more.workspace = true derive_more.workspace = true

10
crates/gpui/build.rs
View File

@ -6,12 +6,12 @@ use std::{
use cbindgen::Config; use cbindgen::Config;
fn main() { fn main() {
generate_dispatch_bindings(); //generate_dispatch_bindings();
let header_path = generate_shader_bindings(); let header_path = generate_shader_bindings();
#[cfg(feature = "runtime_shaders")] //#[cfg(feature = "runtime_shaders")]
emit_stitched_shaders(&header_path); //emit_stitched_shaders(&header_path);
#[cfg(not(feature = "runtime_shaders"))] //#[cfg(not(feature = "runtime_shaders"))]
compile_metal_shaders(&header_path); //compile_metal_shaders(&header_path);
} }
fn generate_dispatch_bindings() { fn generate_dispatch_bindings() {

3
crates/gpui/src/gpui.rs
View File

@ -6,8 +6,7 @@
//! ## Getting Started //! ## Getting Started
//! //!
//! GPUI is still in active development as we work on the Zed code editor and isn't yet on crates.io. //! 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 //! You'll also need to use the latest version of stable rust. Add the following to your Cargo.toml:
//! Cargo.toml:
//! //!
//! ``` //! ```
//! gpui = { git = "https://github.com/zed-industries/zed" } //! gpui = { git = "https://github.com/zed-industries/zed" }

2
rust-toolchain.toml
View File

@ -2,4 +2,4 @@
channel = "1.75" channel = "1.75"
profile = "minimal" profile = "minimal"
components = [ "rustfmt", "clippy" ] 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" ]