From cd52b2ce822d705b2ebd3898bd2abe3985d5819d Mon Sep 17 00:00:00 2001 From: Geoff Martin Date: Fri, 17 May 2024 15:33:04 +0100 Subject: [PATCH 1/3] Attempting to fix Windows build error. --- build.rs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/build.rs b/build.rs index 9258100..c9d4b20 100644 --- a/build.rs +++ b/build.rs @@ -53,7 +53,7 @@ fn main() { println!("cargo:rustc-link-lib=static=iceoryx_hoofs"); println!("cargo:rustc-link-lib=static=iceoryx_posh"); println!("cargo:rustc-link-lib=static=iceoryx_platform"); - + cyclonedds = cyclonedds .env("iceoryx_hoofs_DIR", iceoryx_install_path) .env("iceoryx_posh_DIR", iceoryx_install_path) @@ -62,6 +62,9 @@ fn main() { #[cfg(target_os = "linux")] println!("cargo:rustc-link-lib=acl"); + #[cfg(target_os = "windows")] + println!("cargo:rustc-link-lib=static=bcrypt"); + #[cfg(not(any(target_os = "windows", target_os = "macos")))] println!("cargo:rustc-link-lib=stdc++"); @@ -106,6 +109,8 @@ fn main() { println!("cargo:rustc-link-lib=Iphlpapi"); #[cfg(target_os = "windows")] println!("cargo:rustc-link-lib=DbgHelp"); + #[cfg(target_os = "windows")] + println!("cargo:rustc-link-lib=Bcrypt"); // Build cyclocut let cyclocut_dir = out_dir.join("cyclocut-build"); From 64b14f5a1cfc60f79ca1c9e77e19df292553cb25 Mon Sep 17 00:00:00 2001 From: Geoff Martin Date: Fri, 17 May 2024 15:35:30 +0100 Subject: [PATCH 2/3] Fixing code format issue. --- build.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.rs b/build.rs index c9d4b20..a880da5 100644 --- a/build.rs +++ b/build.rs @@ -53,7 +53,7 @@ fn main() { println!("cargo:rustc-link-lib=static=iceoryx_hoofs"); println!("cargo:rustc-link-lib=static=iceoryx_posh"); println!("cargo:rustc-link-lib=static=iceoryx_platform"); - + cyclonedds = cyclonedds .env("iceoryx_hoofs_DIR", iceoryx_install_path) .env("iceoryx_posh_DIR", iceoryx_install_path) From d76ab0fad24c5c4e57510fcd274d63a3a5d3e6ff Mon Sep 17 00:00:00 2001 From: Geoff Martin Date: Fri, 17 May 2024 15:36:12 +0100 Subject: [PATCH 3/3] Attempting to fix Windows build error. --- build.rs | 3 --- 1 file changed, 3 deletions(-) diff --git a/build.rs b/build.rs index a880da5..b2c3b1c 100644 --- a/build.rs +++ b/build.rs @@ -62,9 +62,6 @@ fn main() { #[cfg(target_os = "linux")] println!("cargo:rustc-link-lib=acl"); - #[cfg(target_os = "windows")] - println!("cargo:rustc-link-lib=static=bcrypt"); - #[cfg(not(any(target_os = "windows", target_os = "macos")))] println!("cargo:rustc-link-lib=stdc++");