diff options
| author | Patrick Walton <pcwalton@mimiga.net> | 2019-10-15 12:57:00 -0500 |
|---|---|---|
| committer | Alan Jeffrey <ajeffrey@mozilla.com> | 2019-11-01 08:47:11 -0500 |
| commit | a358bca7667a2da42024aca4ef619dad6d812862 (patch) | |
| tree | acf2cc228afdf6875931d546cc08ec29dfb05362 /python/servo | |
| parent | 48d918dcdead5fcf38dbda1dfc0d0ca8284108c2 (diff) | |
| download | servo-a358bca7667a2da42024aca4ef619dad6d812862.tar.gz servo-a358bca7667a2da42024aca4ef619dad6d812862.zip | |
Use surfman for managing GL surfaces
Co-authored-by: Alan Jeffrey <ajeffrey@mozilla.com>
Co-authored-by: Zakor Gyula <gyula.zakor@h-lab.eu>
Co-authored-by: Josh Matthews <josh@joshmatthews.net>
Diffstat (limited to 'python/servo')
| -rw-r--r-- | python/servo/build_commands.py | 7 | ||||
| -rw-r--r-- | python/servo/command_base.py | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 6702c571f3a..aa99557c7b7 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -694,13 +694,16 @@ class MachCommands(CommandBase): continue libs = remaining_libs if not libs: - return + return True for lib in libs: print("WARNING: could not find " + lib) # UWP build has its own ANGLE library that it packages. if not uwp: - package_generated_shared_libraries(["libEGL.dll", "libGLESv2.dll"], build_path, servo_exe_dir) + print("Packaging EGL DLLs") + egl_libs = ["libEGL.dll", "libGLESv2.dll"] + if not package_generated_shared_libraries(egl_libs, build_path, servo_exe_dir): + status = 1 # copy needed gstreamer DLLs in to servo.exe dir print("Packaging gstreamer DLLs") diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 3b289e62491..2a82ec51612 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -890,7 +890,7 @@ install them, let us know by filing a bug!") features.append("native-bluetooth") if uwp: features.append("canvas2d-raqote") - features.append("no_wgl") + features.append("no-wgl") features.append("uwp") else: # Non-UWP builds provide their own libEGL via mozangle. @@ -907,7 +907,7 @@ install them, let us know by filing a bug!") env['RUSTFLAGS'] = env.get('RUSTFLAGS', "") + " -C force-frame-pointers=yes" features.append("profilemozjs") if without_wgl: - features.append("no_wgl") + features.append("no-wgl") if self.config["build"]["webgl-backtrace"]: features.append("webgl-backtrace") if self.config["build"]["dom-backtrace"]: |