Fix ios simulator support (#12339)

# Objective

- #12103 broke iOS simulator support, it doesn't even compile anymore

## Solution

- Fix the feature
This commit is contained in:
François 2024-03-06 18:48:17 +01:00 committed by GitHub
parent 9e5db9abc7
commit f9e70abcac
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 10 additions and 5 deletions

View file

@ -318,6 +318,9 @@ embedded_watcher = ["bevy_internal/embedded_watcher"]
# Enable stepping-based debugging of Bevy systems # Enable stepping-based debugging of Bevy systems
bevy_debug_stepping = ["bevy_internal/bevy_debug_stepping"] bevy_debug_stepping = ["bevy_internal/bevy_debug_stepping"]
# Enable support for the ios_simulator by downgrading some rendering capabilities
ios_simulator = ["bevy_internal/ios_simulator"]
[dependencies] [dependencies]
bevy_dylib = { path = "crates/bevy_dylib", version = "0.14.0-dev", default-features = false, optional = true } bevy_dylib = { path = "crates/bevy_dylib", version = "0.14.0-dev", default-features = false, optional = true }
bevy_internal = { path = "crates/bevy_internal", version = "0.14.0-dev", default-features = false } bevy_internal = { path = "crates/bevy_internal", version = "0.14.0-dev", default-features = false }

View file

@ -163,6 +163,9 @@ bevy_debug_stepping = [
"bevy_app/bevy_debug_stepping", "bevy_app/bevy_debug_stepping",
] ]
# Enable support for the ios_simulator by downgrading some rendering capabilities
ios_simulator = ["bevy_pbr?/ios_simulator", "bevy_render?/ios_simulator"]
[dependencies] [dependencies]
# bevy # bevy
bevy_a11y = { path = "../bevy_a11y", version = "0.14.0-dev" } bevy_a11y = { path = "../bevy_a11y", version = "0.14.0-dev" }

View file

@ -61,6 +61,7 @@ The default feature set enables most of the expected features of a game engine,
|file_watcher|Enables watching the filesystem for Bevy Asset hot-reloading| |file_watcher|Enables watching the filesystem for Bevy Asset hot-reloading|
|flac|FLAC audio format support| |flac|FLAC audio format support|
|glam_assert|Enable assertions to check the validity of parameters passed to glam| |glam_assert|Enable assertions to check the validity of parameters passed to glam|
|ios_simulator|Enable support for the ios_simulator by downgrading some rendering capabilities|
|jpeg|JPEG image format support| |jpeg|JPEG image format support|
|minimp3|MP3 audio format support (through minimp3)| |minimp3|MP3 audio format support (through minimp3)|
|mp3|MP3 audio format support| |mp3|MP3 audio format support|

View file

@ -1,5 +0,0 @@
# Flag to notify the compiler we're building for the iOS simulator from an Apple silicon mac
# This needs some workarounds for now
# See https://github.com/bevyengine/bevy/pull/10178 - remove if it's not needed anymore.
[target.aarch64-apple-ios-sim]
features = ["bevy_render/ios_simulator"]

View file

@ -13,6 +13,9 @@ crate-type = ["staticlib", "cdylib"]
[dependencies] [dependencies]
bevy = { path = "../../" } bevy = { path = "../../" }
[target.aarch64-apple-ios-sim.dependencies]
bevy = { path = "../../", features = ["ios_simulator"] }
[package.metadata.android] [package.metadata.android]
package = "org.bevyengine.example" package = "org.bevyengine.example"
apk_name = "bevyexample" apk_name = "bevyexample"