flukejones
/
room4doom
1
0
Fork 0
Code Issues 6 Pull Requests Projects Releases Wiki Activity

Update to use workspace deps

embedded
Luke D. Jones 2022-10-12 14:46:58 +13:00
parent a91851fcdb
commit b2eeeb061a
17 changed files with 113 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Cargo.toml
View File

@ -20,6 +20,40 @@ members = [
"finale/doom"
]
[workspace.package]
version = "0.9.0"
[workspace.dependencies]
wad = { path = "./wad" }
input = { path = "./input" }
menu-doom = { path = "./menu/doom" }
gameplay = { path = "./gameplay" }
gamestate = { path = "./gamestate" }
gamestate-traits = { path = "./gamestate-traits" }
intermission-doom = { path = "./intermission/doom" }
hud-util = { path = "./hud-util" }
hud-doom = { path = "./hud-messages/doom" }
finale-doom = { path = "./finale/doom" }
statusbar-doom = { path = "./statusbar/doom" }
sound-traits = { path = "./sound/traits" }
sound-sdl2 = { path = "./sound/sdl2" }
sound-nosnd = { path = "./sound/nosnd" }
render-traits = { path = "./render/traits" }
render-soft = { path = "./render/software" }
glam = "*"
golem = { git = "https://github.com/flukejones/golem/" }
sdl2 = { git = "https://github.com/Rust-SDL2/rust-sdl2", features = ["mixer"] }
gumdrop = "~0.8"
log = "*"
env_logger = { version = "^0.9", default-features = false, features = ["termcolor", "atty"] }
dirs = "~4.0"
toml = "0.5"
serde = { version = "1.0", features = ["serde_derive"] }
[profile.release]
lto = true
debug = false

9
finale/doom/Cargo.toml
View File

@ -5,8 +5,7 @@ authors = ["Luke Jones <luke@ljones.dev>"]
edition = "2021"
[dependencies]
wad = { path = "../../wad" }
gamestate-traits = { path = "../../gamestate-traits" }
hud-util = { path = "../../hud-util" }
# versions are set by game-exe crate
log = "*"
wad.workspace = true
gamestate-traits.workspace = true
hud-util.workspace = true
log.workspace = true

39
game-exe/Cargo.toml
View File

@ -11,25 +11,26 @@ name = "room4doom"
path = "src/main.rs"
[dependencies]
gumdrop = "~0.8"
input = { path = "../input" }
menu-doom = { path = "../menu/doom" }
gameplay = { path = "../gameplay" }
gamestate = { path = "../gamestate" }
gamestate-traits = { path = "../gamestate-traits" }
gumdrop.workspace = true
input.workspace = true
menu-doom.workspace = true
gameplay.workspace = true
gamestate.workspace = true
gamestate-traits.workspace = true
intermission-doom = { path = "../intermission/doom" }
hud-doom = { path = "../hud-messages/doom" }
finale-doom = { path = "../finale/doom" }
statusbar-doom = { path = "../statusbar/doom" }
intermission-doom.workspace = true
hud-doom.workspace = true
finale-doom.workspace = true
statusbar-doom.workspace = true
sound-traits.workspace = true
sound-sdl2.workspace = true
render-traits.workspace = true
render-soft.workspace = true
wad.workspace = true
sound-traits = { path = "../sound/traits" }
sound-sdl2 = { path = "../sound/sdl2" }
render-traits = { path = "../render/traits" }
render-soft = { path = "../render/software" }
wad = { path = "../wad" }
# utility deps
env_logger = { version = "^0.9", default-features = false, features = ["termcolor", "atty"] }
dirs = "~4.0"
toml = "0.5"
serde = { version = "1.0", features = ["serde_derive"] }
env_logger.workspace = true
dirs.workspace = true
toml.workspace = true
serde.workspace = true

10
gameplay/Cargo.toml
View File

@ -9,8 +9,8 @@ build = "../build.rs"
null_check = []
[dependencies]
sound-traits = { path = "../sound/traits" }
sound-sdl2 = { path = "../sound/sdl2" }
wad = { path = "../wad" }
glam = "~0.20"
log = "^0.4"
sound-traits.workspace = true
sound-sdl2.workspace = true
wad.workspace = true
glam.workspace = true
log.workspace = true

10
gamestate-traits/Cargo.toml
View File

@ -5,8 +5,8 @@ authors = ["Luke Jones <luke@ljones.dev>"]
edition = "2021"
[dependencies]
sdl2 = { git = "https://github.com/Rust-SDL2/rust-sdl2", features = ["mixer"] }
gameplay = { path = "../gameplay" }
render-traits = { path = "../render/traits" }
sound-traits = { path = "../sound/traits" }
wad = { path = "../wad" }
sdl2.workspace = true
gameplay.workspace = true
render-traits.workspace = true
sound-traits.workspace = true
wad.workspace = true

19
gamestate/Cargo.toml
View File

@ -6,13 +6,14 @@ edition = "2021"
license = "MPL-2.0"
[dependencies]
gameplay = { path = "../gameplay" }
gamestate-traits = { path = "../gamestate-traits" }
sound-traits = { path = "../sound/traits" }
sound-sdl2 = { path = "../sound/sdl2" }
sound-nosnd = { path = "../sound/nosnd" }
menu-doom = { path = "../menu/doom" }
wad = { path = "../wad" }
gameplay.workspace = true
gamestate-traits.workspace = true
sound-traits.workspace = true
sound-sdl2.workspace = true
sound-nosnd.workspace = true
menu-doom.workspace = true
wad.workspace = true
# utility deps
toml = "*"
serde = { version = "1.0", features = ["serde_derive"] }
toml.workspace = true
serde.workspace = true

9
hud-messages/doom/Cargo.toml
View File

@ -5,8 +5,7 @@ authors = ["Luke Jones <luke@ljones.dev>"]
edition = "2021"
[dependencies]
wad = { path = "../../wad" }
gamestate-traits = { path = "../../gamestate-traits" }
hud-util = { path = "../../hud-util" }
# versions are set by game-exe crate
log = "*"
wad.workspace = true
gamestate-traits.workspace = true
hud-util.workspace = true
log.workspace = true

7
hud-util/Cargo.toml
View File

@ -5,7 +5,6 @@ authors = ["Luke Jones <luke@ljones.dev>"]
edition = "2021"
[dependencies]
wad = { path = "../wad" }
gamestate-traits = { path = "../gamestate-traits" }
# versions are set by game-exe crate
log = "*"
wad.workspace = true
gamestate-traits.workspace = true
log.workspace = true

6
input/Cargo.toml
View File

@ -8,6 +8,6 @@ license = "MPL-2.0"
[features]
[dependencies]
sdl2 = { git = "https://github.com/Rust-SDL2/rust-sdl2", features = ["mixer"] }
gameplay = { path = "../gameplay" }
serde = { version = "*", features = ["serde_derive"] }
sdl2.workspace = true
gameplay.workspace = true
serde.workspace = true

9
intermission/doom/Cargo.toml
View File

@ -5,8 +5,7 @@ authors = ["Luke Jones <luke@ljones.dev>"]
edition = "2021"
[dependencies]
wad = { path = "../../wad" }
gamestate-traits = { path = "../../gamestate-traits" }
gameplay = { path = "../../gameplay" }
# versions are set by game-exe crate
log = "*"
wad.workspace = true
gamestate-traits.workspace = true
gameplay.workspace = true
log.workspace = true

9
menu/doom/Cargo.toml
View File

@ -5,8 +5,7 @@ authors = ["Luke Jones <luke@ljones.dev>"]
edition = "2021"
[dependencies]
gamestate-traits = { path = "../../gamestate-traits" }
sound-traits = { path = "../../sound/traits" }
wad = { path = "../../wad" }
# versions are set by game-exe crate
log = "*"
gamestate-traits.workspace = true
sound-traits.workspace = true
wad.workspace = true
log.workspace = true

2
multigen/Cargo.toml
View File

@ -5,4 +5,4 @@ authors = ["Luke Jones <luke@ljones.dev>"]
edition = "2021"
[dependencies]
gumdrop = "~0.8"
gumdrop.workspace = true

8
render/software/Cargo.toml
View File

@ -6,9 +6,9 @@ edition = "2021"
build = "../../build.rs"
[dependencies]
glam = "~0.20"
gameplay = { path = "../../gameplay" }
render-traits = { path = "../traits" }
glam.workspace = true
gameplay.workspace = true
render-traits.workspace = true
[dev-dependencies]
wad = { path = "../../wad" }
wad.workspace = true

2
render/traits/Cargo.toml
View File

@ -6,4 +6,4 @@ edition = "2021"
build = "../../build.rs"
[dependencies]
gameplay = { path = "../../gameplay" }
gameplay.workspace = true

14
sound/sdl2/Cargo.toml
View File

@ -8,11 +8,9 @@ build = "../../build.rs"
[features]
[dependencies]
sdl2 = { git = "https://github.com/Rust-SDL2/rust-sdl2", features = ["mixer"] }
wad = { path = "../../wad" }
sound-traits = { path = "../traits" }
# versions are set by game-exe crate
log = "*"
glam = "*"
# Required for config options
serde = { version = "*", features = ["serde_derive"] }
sdl2.workspace = true
wad.workspace = true
sound-traits.workspace = true
log.workspace = true
glam.workspace = true
serde.workspace = true

9
statusbar/doom/Cargo.toml
View File

@ -5,8 +5,7 @@ authors = ["Luke Jones <luke@ljones.dev>"]
edition = "2021"
[dependencies]
wad = { path = "../../wad" }
gamestate-traits = { path = "../../gamestate-traits" }
hud-util = { path = "../../hud-util" }
# versions are set by game-exe crate
log = "*"
wad.workspace = true
gamestate-traits.workspace = true
hud-util.workspace = true
log.workspace = true

2
wad/Cargo.toml
View File

@ -6,4 +6,4 @@ edition = "2021"
license = "MPL-2.0"
[dependencies]
log = "^0.4"
log.workspace = true