Skip to content

Commit

Permalink
This should be more rightful
Browse files Browse the repository at this point in the history
  • Loading branch information
sagudev committed Oct 15, 2023
1 parent 8944ee4 commit 9ee0862
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,14 @@ fn build_windows_dll(data: &build_data::Data, dll_name: &str, def_file: &str) {
// add zlib from libz-sys to include path
let zlib_link_arg = if let Ok(zlib_include_dir) = env::var("DEP_Z_INCLUDE") {
build.include(zlib_include_dir.replace("\\", "/"));
PathBuf::from(zlib_include_dir).parent().unwrap().join("lib").join("z.lib").as_path().display().to_string()
PathBuf::from(zlib_include_dir)
.parent()
.unwrap()
.join("lib")
.join("z.lib")
.as_path()
.display()
.to_string()
} else {
String::from("z.lib")
};
Expand Down Expand Up @@ -164,7 +171,7 @@ fn build_egl(target: &str) {
fn build_angle(target: &String, egl: bool) {
println!("build_angle");
let data = if egl {
build_data::EGL
build_data::GLESv2
} else {
build_data::TRANSLATOR
};
Expand Down Expand Up @@ -223,7 +230,7 @@ fn build_angle(target: &String, egl: bool) {
"windows",
&[
"gfx/angle/checkout/src/common/system_utils_win.cpp",
"gfx/angle/checkout/src/common/system_utils_win32.cpp"
"gfx/angle/checkout/src/common/system_utils_win32.cpp",
][..],
),
] {
Expand Down

0 comments on commit 9ee0862

Please sign in to comment.