diff options
| author | Josh Matthews <josh@joshmatthews.net> | 2019-03-28 00:42:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-28 00:42:24 -0400 |
| commit | 73aeee19a501bc506962aede08c15c46d40a349d (patch) | |
| tree | 8dda54f79c14ad9decfb7fd8c42eac51a3711495 /python/servo | |
| parent | dc55409757f4e61fb838d33a836747d6ed836e46 (diff) | |
| download | servo-73aeee19a501bc506962aede08c15c46d40a349d.tar.gz servo-73aeee19a501bc506962aede08c15c46d40a349d.zip | |
Support 1.15.2 changes.
Diffstat (limited to 'python/servo')
| -rw-r--r-- | python/servo/build_commands.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 1e99b65d989..8033c6859eb 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -611,7 +611,8 @@ class MachCommands(CommandBase): gst_root = "" gst_default_path = path.join("C:\\gstreamer\\1.0", gst_x64) gst_env = "GSTREAMER_1_0_ROOT_" + gst_x64 - if os.path.exists(path.join(gst_default_path, "bin", "libz.dll")): + if os.path.exists(path.join(gst_default_path, "bin", "libffi-7.dll")) or \ + os.path.exists(path.join(gst_default_path, "bin", "ffi-7.dll")): gst_root = gst_default_path elif os.environ.get(gst_env) is not None: gst_root = os.environ.get(gst_env) @@ -639,7 +640,7 @@ class MachCommands(CommandBase): ["libintl-8.dll", "intl-8.dll"], ["liborc-0.4-0.dll", "orc-0.4-0.dll"], ["libwinpthread-1.dll", "winpthread-1.dll"], - ["libz.dll", "libz-1.dll"] + ["libz.dll", "libz-1.dll", "z-1.dll"] ] if gst_root: for gst_lib in gst_dlls: |