-
Notifications
You must be signed in to change notification settings - Fork 38
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #75 from TheButlah/thebutlah/clean-up-workspace
cleaned up workspace
- Loading branch information
Showing
7 changed files
with
56 additions
and
97 deletions.
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,66 +1,66 @@ | ||
[workspace] | ||
resolver = "2" | ||
members = [ | ||
"examples/android", | ||
"examples/demo", | ||
] | ||
|
||
[workspace.package] | ||
edition = "2021" | ||
license = "MIT OR Apache-2.0" | ||
repository = "https://github.com/awtterpip/bevy_oxr" | ||
|
||
[workspace.dependencies] | ||
eyre = "0.6.2" | ||
bevy = "0.13" | ||
openxr = { git = "https://github.com/Ralith/openxrs", rev = "0177d2d" } | ||
color-eyre = "0.6.2" | ||
|
||
[package] | ||
name = "bevy_oxr" | ||
version = "0.1.0" | ||
edition = "2021" | ||
description = "Community crate for OpenXR in Bevy" | ||
repository = "https://github.com/awtterpip/bevy_oxr" | ||
license = "MIT/Apache-2.0" | ||
|
||
edition.workspace = true | ||
license.workspace = true | ||
repository.workspace = true | ||
|
||
[features] | ||
default = ["vulkan", "d3d12"] | ||
force-link = ["openxr/linked"] | ||
vulkan = ["wgpu-core/vulkan"] | ||
d3d12 = ["wgpu-core/dx12", "dep:winapi", "dep:d3d12"] | ||
|
||
[workspace] | ||
members = ["examples/android", "examples/demo"] | ||
|
||
[dependencies] | ||
# anyhow = "1.0.75" | ||
ash = "0.37.3" | ||
bevy = "0.13" | ||
bevy.workspace = true | ||
eyre.workspace = true | ||
futures-lite = "2.0.1" | ||
mint = "0.5.9" | ||
wgpu = "0.19" | ||
wgpu-core = { version = "0.19" } | ||
wgpu-hal = "0.19" | ||
eyre = "0.6.11" | ||
|
||
[target.'cfg(windows)'.dependencies] | ||
openxr = { git = "https://github.com/Ralith/openxrs", rev = "0177d2d", features = [ | ||
"linked", | ||
"static", | ||
"mint", | ||
] } | ||
openxr = { workspace = true, features = [ "linked", "static", "mint" ] } | ||
winapi = { version = "0.3.9", optional = true } | ||
d3d12 = { version = "0.19", features = ["libloading"], optional = true } | ||
|
||
[target.'cfg(all(target_family = "unix", not(target_arch = "wasm32")) )'.dependencies] | ||
openxr = { git = "https://github.com/Ralith/openxrs", rev = "0177d2d", features = [ | ||
"mint", | ||
] } | ||
openxr = { workspace = true, features = [ "mint" ] } | ||
|
||
[target.'cfg(all(not(target_family = "unix"), not(target_arch = "wasm32")))'.dependencies] | ||
openxr = { git = "https://github.com/Ralith/openxrs", rev = "0177d2d", features = [ | ||
"mint", | ||
"static", | ||
] } | ||
openxr = { workspace = true, features = [ "mint", "static" ] } | ||
|
||
[target.'cfg(target_os = "android")'.dependencies] | ||
ndk-context = "0.1" | ||
jni = "0.20" | ||
|
||
[dev-dependencies] | ||
bevy = "0.13" | ||
bevy_rapier3d = { git = "https://github.com/devil-ira/bevy_rapier", branch = "bevy-0.12" } | ||
color-eyre = "0.6.2" | ||
color-eyre.workspace = true | ||
|
||
[[example]] | ||
name = "xr" | ||
path = "examples/xr.rs" | ||
|
||
[profile.release] | ||
debug = true | ||
|
||
[patch.crates-io] | ||
# ndk = { git = "https://github.com/Schmarni-Dev/ndk.git", branch = "070" } |
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,31 +1,15 @@ | ||
[package] | ||
name = "demo" | ||
version = "0.1.0" | ||
edition = "2021" | ||
description = "Demo using bevy_oxr" | ||
edition.workspace = true | ||
publish = false | ||
|
||
[lib] | ||
crate-type = ["rlib", "cdylib"] | ||
|
||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html | ||
|
||
[dependencies] | ||
bevy = "0.13" | ||
bevy.workspace = true | ||
bevy_oxr.path = "../../" | ||
# bevy_rapier3d = { git = "https://github.com/devil-ira/bevy_rapier", branch = "bevy-0.12" } | ||
bevy_rapier3d = "0.25" | ||
color-eyre = "0.6.2" | ||
|
||
|
||
# [target.'cfg(not(target_os="android"))'.dependencies.bevy_oxr] | ||
# path = "../../" | ||
# # May need to be more specific. needs to be false at least on linux without an active runtime to run in flat | ||
# default-features = true | ||
|
||
[profile.release] | ||
debug = true | ||
|
||
[patch.crates-io] | ||
ndk = { git = "https://github.com/Schmarni-Dev/ndk.git", branch = "070" } | ||
ndk-sys = { package = "ndk-sys", git = "https://github.com/Schmarni-Dev/ndk.git", branch = "070" } | ||
ndk-context = { package = "ndk-context", git = "https://github.com/Schmarni-Dev/ndk.git", branch = "070" } | ||
ndk-glue = { package = "ndk-glue", git = "https://github.com/Schmarni-Dev/ndk.git", branch = "070" } | ||
color-eyre.workspace = true |
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
# Use defaults |
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