seoxi/magick-rust
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove Windows-specific invocation of MagickCore-config

Browse Source
This commit is contained in:
Yukun Guo
2024-09-18 11:16:29 +08:00
parent f796041b2f
commit 0b174a7e8a
2 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
build.rs
View File

@ -113,25 +113,14 @@ impl bindgen::callbacks::ParseCallbacks for RemoveEnumVariantSuffixes {
} }
fn main() { fn main() {
let check_cppflags = if cfg!(all(target_os = "windows", not(target_env = "msvc"))) { let check_cppflags = Command::new("MagickCore-config")
// Resolve bash from directories listed in the PATH environment variable in the .arg("--cppflags")
// order they appear. .output()
Command::new("cmd") .or_else(|_| {
.arg("/C") Command::new("pkg-config")
.arg("bash") .args(["--cflags", "MagickCore"])
.arg("MagickCore-config") .output()
.arg("--cppflags") });
.output()
} else {
Command::new("MagickCore-config")
.arg("--cppflags")
.output()
.or_else(|_| {
Command::new("pkg-config")
.args(["--cflags", "MagickCore"])
.output()
})
};
if let Ok(ok_cppflags) = check_cppflags { if let Ok(ok_cppflags) = check_cppflags {
let cppflags = ok_cppflags.stdout; let cppflags = ok_cppflags.stdout;
let cppflags = String::from_utf8(cppflags).unwrap(); let cppflags = String::from_utf8(cppflags).unwrap();

2
src/wand/pixel.rs
View File

@ -93,7 +93,7 @@ impl PixelWand {
set_get_unchecked!( set_get_unchecked!(
get_color_count, set_color_count, PixelGetColorCount, PixelSetColorCount, usize get_color_count, set_color_count, PixelGetColorCount, PixelSetColorCount, usize
get_index, set_index, PixelGetIndex, PixelSetIndex, f32 get_index, set_index, PixelGetIndex, PixelSetIndex, bindings::Quantum
get_fuzz, set_fuzz, PixelGetFuzz, PixelSetFuzz, f64 get_fuzz, set_fuzz, PixelGetFuzz, PixelSetFuzz, f64
); );