From 87857090b455e9ae59ae753b845e5250a07e18f6 Mon Sep 17 00:00:00 2001 From: Schmarni Date: Fri, 31 Oct 2025 02:23:37 +0100 Subject: [PATCH] fix: compiling without the wayland feature Signed-off-by: Schmarni --- src/core/error.rs | 1 - src/main.rs | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/core/error.rs b/src/core/error.rs index 2d11138..42a6d50 100644 --- a/src/core/error.rs +++ b/src/core/error.rs @@ -28,7 +28,6 @@ pub enum ServerError { DeserializationError(#[from] DeserializationError), #[error("Reader error: {0}")] ReaderError(#[from] ReaderError), - #[cfg(feature = "wayland")] #[error("Aspect {} does not exist for node", 0.to_string())] NoAspect(TypeId), #[error("{0}")] diff --git a/src/main.rs b/src/main.rs index ae5b507..07a1c5c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -83,6 +83,7 @@ use tracing::{error, info}; use tracing_subscriber::filter::Directive; use tracing_subscriber::{EnvFilter, fmt, prelude::*}; use tracking_offset::TrackingOffsetPlugin; +#[cfg(feature = "wayland")] use wayland::{Wayland, WaylandPlugin}; use zbus::Connection; use zbus::fdo::ObjectManager; @@ -211,6 +212,7 @@ async fn main() -> Result { let object_registry = ObjectRegistry::new(&dbus_connection).await; + #[cfg(feature = "wayland")] let _wayland = Wayland::new().expect("Couldn't create Wayland instance"); let ready_notifier = Arc::new(Notify::new()); @@ -438,7 +440,9 @@ fn bevy_loop( // object plugins app.add_plugins((PlaySpacePlugin, HandPlugin, ControllerPlugin, HmdPlugin)); // feature plugins - app.add_plugins((WaylandPlugin, TrackingOffsetPlugin, FieldDebugGizmoPlugin)); + #[cfg(feature = "wayland")] + app.add_plugins(WaylandPlugin); + app.add_plugins((TrackingOffsetPlugin, FieldDebugGizmoPlugin)); app.add_systems(PostStartup, move || { ready_notifier.notify_waiters(); });