diff --git a/.cargo/config b/.cargo/config index 34ee985132..87d684cbbf 100644 --- a/.cargo/config +++ b/.cargo/config @@ -30,4 +30,5 @@ tracy-voxygen = "run --bin veloren-voxygen --no-default-features --features trac dbg-voxygen = "run --bin veloren-voxygen --profile debuginfo" # misc 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" diff --git a/server-cli/src/main.rs b/server-cli/src/main.rs index 8c2e97ce41..0a450be5b1 100644 --- a/server-cli/src/main.rs +++ b/server-cli/src/main.rs @@ -91,7 +91,7 @@ fn main() -> io::Result<()> { { agent::init(); } - #[cfg(feature = "hot-site2")] + #[cfg(feature = "hot-site")] { world::init(); } diff --git a/server/Cargo.toml b/server/Cargo.toml index c6058ded41..0cc75a54e1 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -11,7 +11,7 @@ plugins = ["common-state/plugins"] persistent_world = [] hot-reloading = ["common/hot-reloading"] 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"] diff --git a/world/Cargo.toml b/world/Cargo.toml index 9b552d65f7..6ec89254d5 100644 --- a/world/Cargo.toml +++ b/world/Cargo.toml @@ -42,9 +42,6 @@ inline_tweak = "1.0.2" kiddo = "0.2" strum = "0.24.0" -[target.'cfg(windows)'.dependencies] -mimalloc = "0.1.29" - # compression benchmarks lz-fear = { version = "0.1.1", optional = true } deflate = { version = "1.0.0", optional = true } @@ -81,3 +78,6 @@ required-features = ["bin_compression"] [[example]] name = "heightmap_visualization" required-features = ["bin_compression"] + +[target.'cfg(windows)'.dependencies] +mimalloc = "0.1.29"