Skip to content

Commit

Permalink
made android support completly transparent to the user, at the cost o…
Browse files Browse the repository at this point in the history
…f being able to force disable openxr linking
  • Loading branch information
Schmarni-Dev committed Nov 8, 2023
1 parent f552f88 commit 0f7194a
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 9 deletions.
6 changes: 5 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ license = "MIT/Apache-2.0"


[features]
default = ["linked"]
default = []
linked = ["openxr/linked"]

[workspace]
Expand All @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions examples/android/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }

Expand Down
8 changes: 4 additions & 4 deletions examples/demo/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 0f7194a

Please sign in to comment.