mirror of
https://github.com/servo/servo.git
synced 2025-08-04 13:10:20 +01:00
Auto merge of #29955 - servo:windows-subsystem, r=jdm
Set the Windows subsystem using a rust directive This is one less thing that mach has to do now. <!-- Please describe your changes on the following line: --> --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes do not require tests because they do not change behavior. <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
This commit is contained in:
commit
c41334ee3d
2 changed files with 6 additions and 5 deletions
|
@ -14,6 +14,12 @@
|
|||
//!
|
||||
//! [winit]: https://github.com/rust-windowing/winit
|
||||
|
||||
// Normally, rust uses the "Console" Windows subsystem, which pops up a console
|
||||
// when running an application. Switching to the "Windows" subsystem prevents
|
||||
// this, but also hides debugging output. Use the "Windows" console unless debug
|
||||
// mode is turned on.
|
||||
#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
|
||||
|
||||
#[cfg(not(target_os = "android"))]
|
||||
include!("main2.rs");
|
||||
|
||||
|
|
|
@ -425,11 +425,6 @@ class MachCommands(CommandBase):
|
|||
)
|
||||
assert os.path.exists(servo_exe_dir)
|
||||
|
||||
# on msvc builds, use editbin to change the subsystem to windows, but only
|
||||
# on release builds -- on debug builds, it hides log output
|
||||
if not dev and not libsimpleservo:
|
||||
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 and the directory for unit tests.
|
||||
for ssl_lib in ["libssl.dll", "libcrypto.dll"]:
|
||||
ssl_path = path.join(env['OPENSSL_LIB_DIR'], "../bin", ssl_lib)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue