Skip to content

Commit

Permalink
Fix iOS build (#2627)
Browse files Browse the repository at this point in the history
  • Loading branch information
shinyquagsire23 authored Jan 15, 2025
1 parent 1db05ef commit 2305b95
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion alvr/common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ serde = { version = "1", features = ["derive"] }
settings-schema = { git = "https://github.com/alvr-org/settings-schema-rs", rev = "676185f" }
# settings-schema = { path = "../../../../settings-schema-rs/settings-schema" }

[target.'cfg(not(target_os = "android"))'.dependencies]
[target.'cfg(all(not(target_os = "android"), not(target_os = "ios")))'.dependencies]
rfd = "0.14"
6 changes: 3 additions & 3 deletions alvr/common/src/logging.rs
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ pub fn set_panic_hook() {

log::error!("ALVR panicked: {err_str}");

#[cfg(not(target_os = "android"))]
#[cfg(all(not(target_os = "android"), not(target_os = "ios")))]
std::thread::spawn({
let panic_str = panic_info.to_string();
move || {
Expand All @@ -210,7 +210,7 @@ pub fn set_panic_hook() {
pub fn show_w<W: Display + Send + 'static>(w: W) {
log::warn!("{w}");

#[cfg(not(target_os = "android"))]
#[cfg(all(not(target_os = "android"), not(target_os = "ios")))]
std::thread::spawn(move || {
rfd::MessageDialog::new()
.set_title("ALVR warning")
Expand All @@ -228,7 +228,7 @@ pub fn show_warn<T, E: Display + Send + 'static>(res: Result<T, E>) -> Option<T>
fn show_e_block<E: Display>(e: E, blocking: bool) {
log::error!("{e}");

#[cfg(not(target_os = "android"))]
#[cfg(all(not(target_os = "android"), not(target_os = "ios")))]
{
// Store the last error shown in a message box. Do not open a new message box if the content
// of the error has not changed
Expand Down

0 comments on commit 2305b95

Please sign in to comment.