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

Merge pull request #111 from gyk/fix/windows-cpp

Browse Source 
Use C++ compiler on Windows if needed
This commit is contained in:
Nathan Fiedler
2023-11-09 06:50:08 -08:00
committed by GitHub
parent f020fd25f7 8edd324f0b
commit 857085a1a3
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
build.rs
View File

@ -142,7 +142,17 @@ fn main() {
builder = builder.clang_arg(format!("-I{}", d.to_string_lossy())); builder = builder.clang_arg(format!("-I{}", d.to_string_lossy()));
} }
let bindings = builder.generate().unwrap(); let bindings = if cfg!(all(windows, target_pointer_width = "64")) {
match builder.clone().generate() {
Ok(bindings) => bindings,
Err(bindgen::BindgenError::ClangDiagnostic(err_msg)) if err_msg.contains("C++") => {
builder.clang_arg("-xc++").generate().unwrap()
}
Err(err) => panic!("{:?}", err),
}
} else {
builder.generate().unwrap()
};
let mut file = File::create(&bindings_path_str).expect("could not create bindings file"); let mut file = File::create(&bindings_path_str).expect("could not create bindings file");
// Work around the include! issue in rustc (as described in the // Work around the include! issue in rustc (as described in the
// rust-bindgen README file) by wrapping the generated code in a // rust-bindgen README file) by wrapping the generated code in a