Merge pull request #34 from kornelski/libwebp14

Update to libwebp 1.4

Cargo.toml

@@ -13,15 +13,17 @@ readme = "README.md"
 build = "build.rs"
 homepage = "https://github.com/NoXF/libwebp-sys"
 repository = "https://github.com/NoXF/libwebp-sys"
+include = ["src/*.rs", "README.md", "build.rs", "/vendor/src/", "/vendor/sharpyuv", "/vendor/COPYING", "/vendor/PATENTS"]
+exclude = ["*.sh", "*.am"]
 
 edition = "2021"
 
 [profile.test]
 opt-level = 2
 
 [build-dependencies]
-cc = "1"
-glob = "0.3"
+cc = "1.1"
+glob = "0.3.1"
 
 [features]
 default = ["std", "parallel"]

build.rs

@@ -17,9 +17,7 @@ fn main() {
     }
 
     let mut cc = cc::Build::new();
-    let mut sharpyuv_build = cc::Build::new();
     setup_build(&mut cc, &vendor);
-    setup_build(&mut sharpyuv_build, &vendor);
 
     for f in glob::glob("vendor/src/**/*.c")
         .expect("glob vender/src failed")
@@ -30,9 +28,8 @@ fn main() {
 
     for f in glob::glob("vendor/sharpyuv/**/*.c").expect("glob vendor/src failed") {
         let f = f.expect("glob iteration vendor/src failed");
-        sharpyuv_build.file(manifest_dir.join(f));
+        cc.file(manifest_dir.join(f));
     }
-    sharpyuv_build.compile("sharpyuv");
     cc.compile("webpsys");
 }
 
@@ -52,7 +49,7 @@ fn setup_build(build: &mut cc::Build, include_dir: &PathBuf) {
 
     let target_cpu = env::var("TARGET_CPU").ok();
     let target_cpu = target_cpu.as_deref().unwrap_or(&*target_arch);
-    build.flag_if_supported(format!("-march={}", target_cpu));
+    build.flag_if_supported(&format!("-march={}", target_cpu));
 
     match target_arch.as_str() {
         "x86_64" | "i686" => {