made android support completly transparent to the user, at the cost of being able to force disable openxr linking

This commit is contained in:
Schmarni
2023-11-08 07:18:22 +01:00
parent f552f889fe
commit 0f7194ab4d
3 changed files with 13 additions and 9 deletions

View File

@@ -7,7 +7,7 @@ license = "MIT/Apache-2.0"
[features]
default = ["linked"]
default = []
linked = ["openxr/linked"]
[workspace]
@@ -28,6 +28,10 @@ openxr = { version = "0.17.1", features = ["mint"] }
[target.'cfg(not(target_family = "unix"))'.dependencies]
openxr = { version = "0.17.1", features = ["mint", "static"] }
[target.'cfg(not(target_os="android"))'.dependencies]
openxr = { version = "0.17.1", features = ["linked"] }
[dev-dependencies]
bevy = "0.12"
color-eyre = "0.6.2"

View File

@@ -25,16 +25,16 @@ strip = "strip"
target_sdk_version = 32
[target.'cfg(not(target_os="android"))'.dependencies.bevy_oxr]
path = "../../"
default-features = true
# [target.'cfg(not(target_os="android"))'.dependencies.bevy_oxr]
# path = "../../"
# default-features = true
# [package.metadata.android.application]
# icon = "@mipmap/ic_launcher"
# label = "Bevy Example"
[dependencies]
bevy_oxr = { path = "../..", default-features = false }
bevy_oxr = { path = "../.." }
bevy = "0.12"
openxr = { git = "https://github.com/Ralith/openxrs", features = ["mint"] }

View File

@@ -10,11 +10,11 @@ crate-type = ["lib", "cdylib"]
[dependencies]
bevy = "0.12"
bevy_oxr = { path = "../../", default-features = false }
bevy_oxr = { path = "../../" }
bevy_rapier3d = { git = "https://github.com/devil-ira/bevy_rapier", branch = "bevy-0.12" }
color-eyre = "0.6.2"
[target.'cfg(not(target_os="android"))'.dependencies.bevy_oxr]
path = "../../"
default-features = true
# [target.'cfg(not(target_os="android"))'.dependencies.bevy_oxr]
# path = "../../"
# default-features = true