mirror of
https://github.com/wez/wezterm.git
synced 2025-01-01 01:59:49 +03:00
add zlib dep for windows builds
This commit is contained in:
parent
72bcd42e48
commit
df927a84fc
3
.gitmodules
vendored
3
.gitmodules
vendored
@ -10,3 +10,6 @@
|
||||
[submodule "freetype/libpng"]
|
||||
path = deps/freetype/libpng
|
||||
url = https://github.com/glennrp/libpng.git
|
||||
[submodule "deps/freetype/zlib"]
|
||||
path = deps/freetype/zlib
|
||||
url = https://github.com/madler/zlib.git
|
||||
|
@ -25,8 +25,8 @@ before_script:
|
||||
|
||||
script:
|
||||
- "if [[ \"$TRAVIS_RUST_VERSION\" == \"stable\" ]] ; then cargo fmt --all -- --check ; else true ; fi"
|
||||
- cargo build --verbose --all
|
||||
- cargo test --verbose --all
|
||||
- cargo build --verbose
|
||||
- cargo test --verbose -p term -p termwiz -p wezterm -p base91 -p varbincode
|
||||
|
||||
addons:
|
||||
apt:
|
||||
|
1
deps/fontconfig/build.rs
vendored
1
deps/fontconfig/build.rs
vendored
@ -1,5 +1,4 @@
|
||||
use pkg_config;
|
||||
use std::env;
|
||||
|
||||
fn main() {
|
||||
if let Ok(lib) = pkg_config::Config::new()
|
||||
|
10
deps/freetype/build.rs
vendored
10
deps/freetype/build.rs
vendored
@ -1,6 +1,13 @@
|
||||
use cmake::Config;
|
||||
use std::env;
|
||||
|
||||
fn zlib() {
|
||||
let mut config = Config::new("zlib");
|
||||
let dst = config.profile("Release").build();
|
||||
println!("cargo:rustc-link-search=native={}/lib", dst.display());
|
||||
println!("cargo:rustc-link-lib=static=z");
|
||||
}
|
||||
|
||||
fn libpng() {
|
||||
let mut config = Config::new("libpng");
|
||||
let dst = config.profile("Release").build();
|
||||
@ -18,13 +25,12 @@ fn freetype() {
|
||||
println!("cargo:rustc-link-search=native={}/lib", dst.display());
|
||||
println!("cargo:rustc-link-lib=static=freetype");
|
||||
println!("cargo:rustc-link-search=native=/usr/lib");
|
||||
// println!("cargo:rustc-link-lib=bz2");
|
||||
println!("cargo:rustc-link-lib=z");
|
||||
println!("cargo:include={}/include/freetype2", dst.display());
|
||||
println!("cargo:lib={}/lib/libfreetype.a", dst.display());
|
||||
}
|
||||
|
||||
fn main() {
|
||||
zlib();
|
||||
libpng();
|
||||
freetype();
|
||||
let out_dir = env::var("OUT_DIR").unwrap();
|
||||
|
1
deps/freetype/zlib
vendored
Submodule
1
deps/freetype/zlib
vendored
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit cacf7f1d4e3d44d871b605da3b647f07d718623f
|
1
deps/harfbuzz/build.rs
vendored
1
deps/harfbuzz/build.rs
vendored
@ -32,7 +32,6 @@ fn harfbuzz() {
|
||||
println!("cargo:rustc-link-search=native={}/lib", dst.display());
|
||||
println!("cargo:rustc-link-lib=static=harfbuzz");
|
||||
println!("cargo:rustc-link-search=native=/usr/lib");
|
||||
println!("cargo:rustc-link-lib=z");
|
||||
}
|
||||
|
||||
fn main() {
|
||||
|
@ -244,6 +244,6 @@ mod tests {
|
||||
fn roundtrip_rgbcolor() {
|
||||
let data = bincode::serialize(&RgbColor::from_named("DarkGreen").unwrap()).unwrap();
|
||||
eprintln!("serialized as {:?}", data);
|
||||
let decoded: RgbColor = bincode::deserialize(&data).unwrap();
|
||||
let _decoded: RgbColor = bincode::deserialize(&data).unwrap();
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user