Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Addressed review

Browse Source
This commit is contained in:
Sam 2023-01-09 19:41:07 -05:00
parent 7d42c45fdd
commit 4f26e37ae6
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.cargo/config
View File

@ -30,4 +30,5 @@ tracy-voxygen = "run --bin veloren-voxygen --no-default-features --features trac
dbg-voxygen = "run --bin veloren-voxygen --profile debuginfo" dbg-voxygen = "run --bin veloren-voxygen --profile debuginfo"
# misc # misc
swarm = "run --bin swarm --features client/bin_bot,client/tick_network --" swarm = "run --bin swarm --features client/bin_bot,client/tick_network --"
ci-clippy = "clippy --all-targets --locked --features=bin_cmd_doc_gen,bin_compression,bin_csv,bin_graphviz,bin_bot,bin_asset_migrate,asset_tweak" ci-clippy = "clippy --all-targets --locked --features=bin_cmd_doc_gen,bin_compression,bin_csv,bin_graphviz,bin_bot,bin_asset_migrate,asset_tweak,bin,stat"
ci-clippy2 = "clippy -p veloren-voxygen --locked --no-default-features --features=default-publish"

2
server-cli/src/main.rs
View File

@ -91,7 +91,7 @@ fn main() -> io::Result<()> {
{ {
agent::init(); agent::init();
} }
#[cfg(feature = "hot-site2")] #[cfg(feature = "hot-site")]
{ {
world::init(); world::init();
} }

2
server/Cargo.toml
View File

@ -11,7 +11,7 @@ plugins = ["common-state/plugins"]
persistent_world = [] persistent_world = []
hot-reloading = ["common/hot-reloading"] hot-reloading = ["common/hot-reloading"]
hot-agent = ["server-agent/use-dyn-lib"] hot-agent = ["server-agent/use-dyn-lib"]
hot-site2 = ["world/use-dyn-lib"] hot-site = ["world/use-dyn-lib"]
default = ["worldgen", "plugins", "persistent_world", "simd"] default = ["worldgen", "plugins", "persistent_world", "simd"]

6
world/Cargo.toml
View File

@ -42,9 +42,6 @@ inline_tweak = "1.0.2"
kiddo = "0.2" kiddo = "0.2"
strum = "0.24.0" strum = "0.24.0"
[target.'cfg(windows)'.dependencies]
mimalloc = "0.1.29"
# compression benchmarks # compression benchmarks
lz-fear = { version = "0.1.1", optional = true } lz-fear = { version = "0.1.1", optional = true }
deflate = { version = "1.0.0", optional = true } deflate = { version = "1.0.0", optional = true }
@ -81,3 +78,6 @@ required-features = ["bin_compression"]
[[example]] [[example]]
name = "heightmap_visualization" name = "heightmap_visualization"
required-features = ["bin_compression"] required-features = ["bin_compression"]
[target.'cfg(windows)'.dependencies]
mimalloc = "0.1.29"