From fc759c005d38259585b92a5bd7d627e85a26105d Mon Sep 17 00:00:00 2001 From: Lucas Schwiderski Date: Wed, 8 Nov 2023 09:43:50 +0100 Subject: [PATCH] oodle: Fix building for target Windows --- lib/oodle/build.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/oodle/build.rs b/lib/oodle/build.rs index 7b200aa..e33c7d5 100644 --- a/lib/oodle/build.rs +++ b/lib/oodle/build.rs @@ -6,9 +6,8 @@ use std::path::PathBuf; fn main() { let manifest_dir = std::env::var("CARGO_MANIFEST_DIR").expect("No CARGO_MANIFEST_DIR"); println!("cargo:rustc-link-search=native={}", &manifest_dir); - dbg!(&manifest_dir); - if std::env::var("CARGO_CFG_WINDOWS").is_ok() { + if std::env::var("CARGO_CFG_TARGET_FAMILY") == Ok(String::from("windows")) { let lib_name = if cfg!(debug_assertions) { "oo2core_win64_debug" } else { @@ -17,7 +16,7 @@ fn main() { println!("cargo:rustc-link-lib=static={}", lib_name); } else { println!("cargo:rustc-link-lib=static=oo2corelinux64"); - println!("cargo:rustc-link-lib=stdc++") + println!("cargo:rustc-link-lib=stdc++"); } println!("cargo:rerun-if-changed=oodle2.h");