From 0f07b71f184ad667da23937a7483931eca9e8e30 Mon Sep 17 00:00:00 2001 From: fufesou Date: Fri, 19 May 2023 23:38:18 +0800 Subject: [PATCH] fix build windows i686 Signed-off-by: fufesou --- libs/hbb_common/src/config.rs | 2 +- src/server/connection.rs | 2 +- src/server/video_service.rs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/hbb_common/src/config.rs b/libs/hbb_common/src/config.rs index bf946f4f0..693acb8f4 100644 --- a/libs/hbb_common/src/config.rs +++ b/libs/hbb_common/src/config.rs @@ -1456,7 +1456,7 @@ impl ConfigOidc { fn _load_env(mut self) -> Self { use std::env; - for (k, mut v) in &mut self.providers { + for (k, v) in &mut self.providers { if let Ok(client_id) = env::var(format!("OIDC-{}-CLIENT-ID", k.to_uppercase())) { v.client_id = client_id; } diff --git a/src/server/connection.rs b/src/server/connection.rs index 9bffebf4f..8c211df39 100644 --- a/src/server/connection.rs +++ b/src/server/connection.rs @@ -1940,7 +1940,7 @@ impl Connection { fn change_resolution(&mut self, r: &Resolution) { if self.keyboard { if let Ok(name) = video_service::get_current_display_name() { - #[cfg(target_os = "windows")] + #[cfg(all(windows, feature = "virtual_display_driver"))] if let Some(_ok) = crate::virtual_display_manager::change_resolution_if_is_virtual_display( &name, diff --git a/src/server/video_service.rs b/src/server/video_service.rs index 6bb491758..b76ee3fc6 100644 --- a/src/server/video_service.rs +++ b/src/server/video_service.rs @@ -897,9 +897,9 @@ pub fn handle_one_frame_encoded( #[inline] fn get_original_resolution(display_name: &str, w: usize, h: usize) -> MessageField { - #[cfg(target_os = "windows")] + #[cfg(all(windows, feature = "virtual_display_driver"))] let is_virtual_display = crate::virtual_display_manager::is_virtual_display(&display_name); - #[cfg(not(target_os = "windows"))] + #[cfg(not(all(windows, feature = "virtual_display_driver")))] let is_virtual_display = false; Some(if is_virtual_display { Resolution {