Skip to content

Commit

Permalink
Revert "native_viewer is now an opt-in feature of the rerun libra…
Browse files Browse the repository at this point in the history
…ry (#2064)"

This reverts commit 697af91.
  • Loading branch information
emilk authored May 9, 2023
1 parent 697af91 commit cb4b560
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 31 deletions.
10 changes: 1 addition & 9 deletions crates/rerun/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,13 @@ all-features = true
targets = ["x86_64-unknown-linux-gnu", "wasm32-unknown-unknown"]


[[bin]]
# For the `rerun` binary, always add the `native_viewer` feature.
# See https://github.com/rerun-io/rerun/issues/1997
name = "rerun"
required-features = ["native_viewer"]


[features]
default = [
# We omit `native_viewer` to improve the default compile times.
"analytics",
"demo",
"glam",
"image",
"native_viewer",
"server",
"sdk",
]
Expand Down Expand Up @@ -83,7 +76,6 @@ web_viewer = [
"re_ws_comms/server",
]


[dependencies]
re_build_info.workspace = true
re_data_store.workspace = true
Expand Down
5 changes: 1 addition & 4 deletions examples/rust/api_demo/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@ license = "MIT OR Apache-2.0"
publish = false

[dependencies]
rerun = { path = "../../../crates/rerun", features = [
"native_viewer",
"web_viewer",
] }
rerun = { path = "../../../crates/rerun", features = ["web_viewer"] }

anyhow = "1.0"
clap = { version = "4.0", features = ["derive"] }
Expand Down
5 changes: 1 addition & 4 deletions examples/rust/clock/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@ license = "MIT OR Apache-2.0"
publish = false

[dependencies]
rerun = { path = "../../../crates/rerun", features = [
"native_viewer",
"web_viewer",
] }
rerun = { path = "../../../crates/rerun", features = ["web_viewer"] }

anyhow = "1.0"
clap = { version = "4.0", features = ["derive"] }
Expand Down
2 changes: 1 addition & 1 deletion examples/rust/dna/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0"
publish = false

[dependencies]
rerun = { path = "../../../crates/rerun", features = ["native_viewer"] }
rerun = { path = "../../../crates/rerun", features = ["web_viewer"] }

itertools = "0.10"
rand = "0.8"
2 changes: 1 addition & 1 deletion examples/rust/minimal/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ license = "MIT OR Apache-2.0"
publish = false

[dependencies]
rerun = { path = "../../../crates/rerun", features = ["native_viewer"] }
rerun = { path = "../../../crates/rerun" }
5 changes: 1 addition & 4 deletions examples/rust/minimal_options/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@ license = "MIT OR Apache-2.0"
publish = false

[dependencies]
rerun = { path = "../../../crates/rerun", features = [
"native_viewer",
"web_viewer",
] }
rerun = { path = "../../../crates/rerun", features = ["web_viewer"] }

anyhow = "1.0"
clap = { version = "4.0", features = ["derive"] }
Expand Down
5 changes: 1 addition & 4 deletions examples/rust/objectron/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,7 @@ publish = false


[dependencies]
rerun = { path = "../../../crates/rerun", features = [
"native_viewer",
"web_viewer",
] }
rerun = { path = "../../../crates/rerun", features = ["web_viewer"] }

anyhow = "1.0"
clap = { version = "4.0", features = ["derive"] }
Expand Down
5 changes: 1 addition & 4 deletions examples/rust/raw_mesh/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@ license = "MIT OR Apache-2.0"
publish = false

[dependencies]
rerun = { path = "../../../crates/rerun", features = [
"native_viewer",
"web_viewer",
] }
rerun = { path = "../../../crates/rerun", features = ["web_viewer"] }

anyhow = "1.0"
bytes = "1.3"
Expand Down

0 comments on commit cb4b560

Please sign in to comment.