Skip to content
Permalink
Browse files

Upgrade mozangle to 0.2 for libEGL.dll.

  • Loading branch information...
jdm committed Mar 9, 2019
1 parent 3bfbfa7 commit 79938affb3edf67ab08524c934ed68a769e13202
Showing with 24 additions and 39 deletions.
  1. +5 −27 Cargo.lock
  2. +1 −1 components/script/Cargo.toml
  3. +1 −1 ports/glutin/Cargo.toml
  4. +17 −10 python/servo/build_commands.py

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -115,4 +115,4 @@ webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]}
webvr_traits = {path = "../webvr_traits"}

[target.'cfg(not(target_os = "ios"))'.dependencies]
mozangle = "0.1"
mozangle = "0.2"
@@ -66,7 +66,7 @@ sig = "1.0"
x11 = "2.0.0"

[target.'cfg(target_os = "windows")'.dependencies]
mozangle = { version = "0.1", features = ["egl"] }
mozangle = { version = "0.2", features = ["egl"] }
winapi = { version = "0.3", features = ["wingdi", "winuser"] }

[target.'cfg(any(target_os = "macos", all(target_arch = "x86_64", target_os = "linux")))'.dependencies]
@@ -629,16 +629,23 @@ def build(self, target=None, release=False, dev=False, jobs=None,
servo_exe_dir)
# Search for the generated nspr4.dll
build_path = path.join(servo_exe_dir, "build")
nspr4 = "nspr4.dll"
nspr4_path = None
for root, dirs, files in os.walk(build_path):
if nspr4 in files:
nspr4_path = path.join(root, nspr4)
break
if nspr4_path is None:
print("WARNING: could not find nspr4.dll")
else:
shutil.copy(nspr4_path, servo_exe_dir)

def package_generated_shared_libraries(libs, build_path, servo_exe_dir):
for root, dirs, files in os.walk(build_path):
remaining_libs = list(libs)
for lib in libs:
if lib in files:
shutil.copy(path.join(root, lib), servo_exe_dir)
remaining_libs.remove(lib)
continue
libs = remaining_libs
if not libs:
return
for lib in libs:
print("WARNING: could not find " + lib)

package_generated_shared_libraries(["nspr4.dll", "libEGL.dll"], build_path, servo_exe_dir)

# copy needed gstreamer DLLs in to servo.exe dir
gst_x64 = "X86_64" if msvc_x64 == "64" else "X86"
gst_root = ""

0 comments on commit 79938af

Please sign in to comment.
You can’t perform that action at this time.