diff options
| author | Vladimir Vukicevic <vladimir@pobox.com> | 2016-08-15 12:55:04 -0400 |
|---|---|---|
| committer | Vladimir Vukicevic <vladimir@pobox.com> | 2016-08-17 09:51:42 -0400 |
| commit | ab007315c20f8f9ec43ad40743e803b1ec490bf6 (patch) | |
| tree | cc43b9e9197df7ffc7021b3fb9216e2930f58414 | |
| parent | e7dd579ebf14317e284f4f9641e4bf0b8f99022f (diff) | |
| download | servo-ab007315c20f8f9ec43ad40743e803b1ec490bf6.tar.gz servo-ab007315c20f8f9ec43ad40743e803b1ec490bf6.zip | |
Copy in DLLs to servo.exe dir
| -rw-r--r-- | python/servo/build_commands.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 9ff87249d18..708640208b8 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -257,10 +257,17 @@ class MachCommands(CommandBase): # On windows, copy in our manifest shutil.copy(path.join(self.get_top_dir(), "components", "servo", "servo.exe.manifest"), servo_exe_dir) - # And on msvc builds, use editbin to change the subsystem to windows if "msvc" in host_triple(): + # on msvc builds, use editbin to change the subsystem to windows call(["editbin", "/nologo", "/subsystem:windows", path.join(servo_exe_dir, "servo.exe")], verbose=verbose) + # on msvc, we need to copy in some DLLs in to the servo.exe dir + for ssl_lib in ["ssleay32md.dll", "libeay32md.dll"]: + shutil.copy(path.join(os.getenv('OPENSSL_LIB_DIR'), "../bin64", ssl_lib), + servo_exe_dir) + for ffmpeg_lib in ["avutil-55.dll", "avformat-57.dll", "avcodec-57.dll", "swresample-2.dll"]: + shutil.copy(path.join(os.getenv('FFMPEG_LIB_DIR'), "../bin", ffmpeg_lib), + servo_exe_dir) elif sys.platform == "darwin": # On the Mac, set a lovely icon. This makes it easier to pick out the Servo binary in tools |