- update README
- fix tests - crt-static in build.rs
This commit is contained in:
@@ -236,13 +236,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||
let _importexport_guard = patch_importexport(&libcziapi_inc)?;
|
||||
let dst = cmake_config.build();
|
||||
|
||||
#[cfg(not(feature = "dynamic"))]
|
||||
let bindings = bindgen::Builder::default();
|
||||
|
||||
#[cfg(feature = "dynamic")]
|
||||
let bindings = bindgen::Builder::default();
|
||||
|
||||
let bindings = bindings
|
||||
let bindings = bindgen::Builder::default()
|
||||
.merge_extern_blocks(true)
|
||||
.clang_args([
|
||||
"-fms-extensions",
|
||||
@@ -268,11 +262,9 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||
.ok_or(Error::msg("cannot into string"))?,
|
||||
)
|
||||
.generate()?;
|
||||
|
||||
bindings.write_to_file(dst.join("lib_czi_api.rs"))?;
|
||||
|
||||
#[cfg(not(feature = "dynamic"))]
|
||||
{
|
||||
if cfg!(any(not(feature = "dynamic"), target_feature = "crt-static")) {
|
||||
let libcziapi_dir = dst.join("build/Src/libCZIAPI");
|
||||
let libcziapi_dir2 = dst.join("Src/libCZIAPI");
|
||||
let libczi_dir = dst.join("build/Src/libCZI");
|
||||
@@ -367,10 +359,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||
println!("cargo::rustc-link-lib=shell32");
|
||||
println!("cargo::rustc-link-lib=Windowscodecs");
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(feature = "dynamic")]
|
||||
{
|
||||
} else {
|
||||
println!(
|
||||
"cargo::rustc-link-search=native={}",
|
||||
dst.join("build/Src/libCZIAPI").display()
|
||||
|
||||
Reference in New Issue
Block a user