diff --git a/server-cli/Cargo.toml b/server-cli/Cargo.toml index 3bdc9f0b65..84cea7e4d3 100644 --- a/server-cli/Cargo.toml +++ b/server-cli/Cargo.toml @@ -43,7 +43,7 @@ tracing = { version = "0.1", default-features = false } ron = {version = "0.7", default-features = false} serde = {version = "1.0", features = [ "rc", "derive" ]} -[target.'cfg(windows)'.dependencies] +[target.'cfg(all(windows, target_env="msvc"))'.dependencies] mimalloc = "0.1.29" [dependencies.tui] diff --git a/server-cli/src/main.rs b/server-cli/src/main.rs index e88c6d7572..1e0875e340 100644 --- a/server-cli/src/main.rs +++ b/server-cli/src/main.rs @@ -2,7 +2,7 @@ #![deny(clippy::clone_on_ref_ptr)] #![feature(bool_to_option)] -#[cfg(target_os = "windows")] +#[cfg(all(target_os = "windows", target_env = "msvc"))] #[global_allocator] static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc; diff --git a/voxygen/Cargo.toml b/voxygen/Cargo.toml index 2d4ff19849..24167bc279 100644 --- a/voxygen/Cargo.toml +++ b/voxygen/Cargo.toml @@ -138,7 +138,7 @@ dispatch = "0.1.4" [target.'cfg(windows)'.build-dependencies] winres = "0.1" -[target.'cfg(windows)'.dependencies] +[target.'cfg(all(windows, target_env="msvc"))'.dependencies] mimalloc = "0.1.29" # Mumble diff --git a/voxygen/anim/Cargo.toml b/voxygen/anim/Cargo.toml index 9c4a7a2b07..0a6b1ebcf3 100644 --- a/voxygen/anim/Cargo.toml +++ b/voxygen/anim/Cargo.toml @@ -21,5 +21,5 @@ voxygen-dynlib = {package = "veloren-voxygen-dynlib", path = "../dynlib", option # Hot Reloading lazy_static = {version = "1.4.0", optional = true} -[target.'cfg(windows)'.dependencies] +[target.'cfg(all(windows, target_env="msvc"))'.dependencies] mimalloc = "0.1.29" diff --git a/voxygen/anim/src/lib.rs b/voxygen/anim/src/lib.rs index e3aa8d44f9..b5f7b96b56 100644 --- a/voxygen/anim/src/lib.rs +++ b/voxygen/anim/src/lib.rs @@ -4,7 +4,7 @@ #[cfg(all(feature = "be-dyn-lib", feature = "use-dyn-lib"))] compile_error!("Can't use both \"be-dyn-lib\" and \"use-dyn-lib\" features at once"); -#[cfg(all(target_os = "windows", feature = "be-dyn-lib"))] +#[cfg(all(target_os = "windows", target_env = "msvc", feature = "be-dyn-lib"))] #[global_allocator] static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc; diff --git a/voxygen/src/main.rs b/voxygen/src/main.rs index 86c43540aa..3b66bbb74c 100644 --- a/voxygen/src/main.rs +++ b/voxygen/src/main.rs @@ -4,6 +4,7 @@ #[cfg(all( target_os = "windows", + target_env = "msvc", not(feature = "tracy-memory"), not(feature = "hot-egui") ))]