Change logic to disable OpenXR for iOS #781
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Tested on [Host] [Target] |
|
Thanks a lot! Maybe someone with macOS can help review this, e.g. @Ughuuu? |
Bromeon
reviewed
Jun 26, 2024
Comment on lines
91
to
101
| let target_os = std::env::var("CARGO_CFG_TARGET_OS").unwrap_or_else(|_| "unknown".to_string()); | ||
| if godot_ty.starts_with("OpenXR") { | ||
| return true; | ||
| if target_os == "ios" { | ||
| return true; | ||
| } | ||
| if target_os == "macos" { | ||
| #[cfg(before_api = "4.2")] | ||
| return true; | ||
| } | ||
| } |
There was a problem hiding this comment.
I think the let could be moved inside if.
Also, you might want to use match against Some("ios"), Some("macos") and None -- then you wouldn't need the "unknown" case.
There was a problem hiding this comment.
I have updated with match statement
Due to `target_os = ios` not working when cross-platform building, use `CARGO_CFG_TARGET_OS` to check the target OS instead.
|
@Bromeon there isn't much code I am familiar with here, looks good to me tho. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Due to
target_os = iosnot working when cross-platform building,use
CARGO_CFG_TARGET_OSto check the target OS instead.