commit 7eba19e904970000a4d84be5e87f8870ba7eb781 Author: Jakub Panek Date: Sun Feb 6 19:25:19 2022 +0000 fix: link against system libraries Signed-off-by: Jakub Panek diff --git a/Cargo.lock b/Cargo.lock index be5c056a6..519cda843 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5264,6 +5264,7 @@ checksum = "ebd5b733d7cf2d9447e2c3e76a5589b4f5e5ae065c22a2bc0b023cbc331b6c8e" dependencies = [ "cc", "libc", + "pkg-config", ] [[package]] diff --git a/codec/Cargo.toml b/codec/Cargo.toml index 8d72ba564..e02d66291 100644 --- a/codec/Cargo.toml +++ b/codec/Cargo.toml @@ -20,7 +20,7 @@ smol = "1.2" termwiz = { path = "../termwiz" } varbincode = "0.1" wezterm-term = { path = "../term", features=["use_serde"] } -zstd = "0.6" +zstd = { version = "0.6", features = ["pkg-config"] } [dev-dependencies] base91 = { path = "../base91" } diff --git a/deps/freetype/build.rs b/deps/freetype/build.rs index 7e752f474..285c5313d 100644 --- a/deps/freetype/build.rs +++ b/deps/freetype/build.rs @@ -230,9 +230,9 @@ fn git_submodule_update() { } fn main() { - zlib(); - libpng(); - freetype(); + println!("cargo:rustc-link-lib=z"); + println!("cargo:rustc-link-lib=png"); + println!("cargo:rustc-link-lib=freetype"); let out_dir = env::var("OUT_DIR").unwrap(); println!("cargo:outdir={}", out_dir); println!("cargo:rustc-env=MACOSX_DEPLOYMENT_TARGET=10.9"); diff --git a/deps/harfbuzz/build.rs b/deps/harfbuzz/build.rs index 8753306a0..669d73039 100644 --- a/deps/harfbuzz/build.rs +++ b/deps/harfbuzz/build.rs @@ -118,7 +118,7 @@ fn git_submodule_update() { } fn main() { - harfbuzz(); + println!("cargo:rustc-link-lib=harfbuzz"); let out_dir = env::var("OUT_DIR").unwrap(); println!("cargo:outdir={}", out_dir); println!("cargo:rustc-env=MACOSX_DEPLOYMENT_TARGET=10.9");