Skip to content

Commit

Permalink
Allow building Rojo with profile-with-tracy feature (#862)
Browse files Browse the repository at this point in the history
  • Loading branch information
Dekkonot authored Feb 20, 2024
1 parent 02d79a4 commit 42121a9
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 31 deletions.
33 changes: 6 additions & 27 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ default = []
# Enable this feature to live-reload assets from the web UI.
dev_live_assets = []

profile-with-tracy = ["profiling/profile-with-tracy", "tracy-client"]
# Run Rojo with this feature to open a Tracy session.
# Currently uses protocol v63, last supported in Tracy 0.9.1.
profile-with-tracy = ["profiling/profile-with-tracy"]

[workspace]
members = ["crates/*"]
Expand Down Expand Up @@ -87,8 +89,7 @@ thiserror = "1.0.30"
tokio = { version = "1.12.0", features = ["rt", "rt-multi-thread"] }
uuid = { version = "1.0.0", features = ["v4", "serde"] }
clap = { version = "3.1.18", features = ["derive"] }
profiling = "1.0.6"
tracy-client = { version = "0.13.2", optional = true }
profiling = "1.0.14"

[target.'cfg(windows)'.dependencies]
winreg = "0.10.1"
Expand Down
2 changes: 1 addition & 1 deletion src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use librojo::cli::Options;

fn main() {
#[cfg(feature = "profile-with-tracy")]
tracy_client::Client::start();
profiling::tracy_client::Client::start();

panic::set_hook(Box::new(|panic_info| {
// PanicInfo's payload is usually a &'static str or String.
Expand Down

0 comments on commit 42121a9

Please sign in to comment.