Skip to content

Commit

Permalink
Merge pull request #42 from oli-obk/android_fix_fix
Browse files Browse the repository at this point in the history
Reuse the bevy_web_asset logic
  • Loading branch information
Karl-Josef Adler authored Nov 29, 2023
2 parents afc2aca + a638119 commit 56f5c35
Show file tree
Hide file tree
Showing 5 changed files with 150 additions and 145 deletions.
90 changes: 81 additions & 9 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 3 additions & 8 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,14 @@ futures-io = "0.3.29"
glam = "0"
bevy_screen_diagnostics = { git = "https://github.com/oli-obk/bevy_screen_diagnostics.git" }
globe-rs = "0.1.8"

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
surf = { version = "2.3.2", default-features = false, features = [
"h1-client-rustls",
] }
directories = "5.0.1"
async-fs = "2.1.0"
bevy_web_asset = { git = "https://github.com/oli-obk/bevy_web_asset.git", branch = "android" }

[target.'cfg(target_arch = "wasm32")'.dependencies]
web-sys = { version = "0.3.22", default-features = false, features = [
"Location",
] }
js-sys = { version = "0.3", default-features = false }
wasm-bindgen = { version = "0.2", default-features = false }
wasm-bindgen-futures = "0.4"

[target.'cfg(not(any(target_os="macos", target_arch = "wasm32")))'.dependencies]
bevy_oxr = { git = "https://github.com/awtterpip/bevy_openxr", optional = true }
Expand Down
Loading

0 comments on commit 56f5c35

Please sign in to comment.