Skip to content

Commit 3bba01a

Browse files
committed
This should be more rightful
1 parent 7322603 commit 3bba01a

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

build.rs

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,14 @@ fn build_windows_dll(data: &build_data::Data, dll_name: &str, def_file: &str) {
6767
// add zlib from libz-sys to include path
6868
let zlib_link_arg = if let Ok(zlib_include_dir) = env::var("DEP_Z_INCLUDE") {
6969
build.include(zlib_include_dir.replace("\\", "/"));
70-
PathBuf::from(zlib_include_dir).parent().unwrap().join("lib").join("z.lib").as_path().display().to_string()
70+
PathBuf::from(zlib_include_dir)
71+
.parent()
72+
.unwrap()
73+
.join("lib")
74+
.join("z.lib")
75+
.as_path()
76+
.display()
77+
.to_string()
7178
} else {
7279
String::from("z.lib")
7380
};
@@ -164,7 +171,7 @@ fn build_egl(target: &str) {
164171
fn build_angle(target: &String, egl: bool) {
165172
println!("build_angle");
166173
let data = if egl {
167-
build_data::EGL
174+
build_data::GLESv2
168175
} else {
169176
build_data::TRANSLATOR
170177
};
@@ -223,7 +230,7 @@ fn build_angle(target: &String, egl: bool) {
223230
"windows",
224231
&[
225232
"gfx/angle/checkout/src/common/system_utils_win.cpp",
226-
"gfx/angle/checkout/src/common/system_utils_win32.cpp"
233+
"gfx/angle/checkout/src/common/system_utils_win32.cpp",
227234
][..],
228235
),
229236
] {

0 commit comments

Comments
 (0)