diff options
| author | David Lönnhager <david.l@mullvad.net> | 2022-08-29 10:42:02 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2022-09-01 10:55:05 +0200 |
| commit | 44478a1c7276d2bf57605829bde8a0e237243f1a (patch) | |
| tree | 500a33559a4b1d36bc7ecd1376b4533c528939be /mullvad-cli | |
| parent | 5ade6d8c5c346d8ab5fdd559a4d2b27956d7176c (diff) | |
| download | mullvadvpn-44478a1c7276d2bf57605829bde8a0e237243f1a.tar.xz mullvadvpn-44478a1c7276d2bf57605829bde8a0e237243f1a.zip | |
Replace winapi with windows-sys for all remaining crates
Diffstat (limited to 'mullvad-cli')
| -rw-r--r-- | mullvad-cli/Cargo.toml | 7 | ||||
| -rw-r--r-- | mullvad-cli/build.rs | 11 |
2 files changed, 14 insertions, 4 deletions
diff --git a/mullvad-cli/Cargo.toml b/mullvad-cli/Cargo.toml index 73fc3a8d79..f817e83de6 100644 --- a/mullvad-cli/Cargo.toml +++ b/mullvad-cli/Cargo.toml @@ -34,7 +34,12 @@ clap_complete = { version = "3.0" } [target.'cfg(windows)'.build-dependencies] winres = "0.1" -winapi = "0.3" + +[target.'cfg(windows)'.build-dependencies.windows-sys] +version = "0.36.1" +features = [ + "Win32_System_SystemServices", +] [package.metadata.winres] ProductName = "Mullvad VPN" diff --git a/mullvad-cli/build.rs b/mullvad-cli/build.rs index 4c19603b76..b2cc9c3d9a 100644 --- a/mullvad-cli/build.rs +++ b/mullvad-cli/build.rs @@ -1,5 +1,10 @@ use std::{env, fs, path::PathBuf}; +#[cfg(windows)] +fn make_lang_id(p: u16, s: u16) -> u16 { + (s << 10) | p +} + fn main() { let out_dir = PathBuf::from(env::var_os("OUT_DIR").unwrap()); let product_version = env!("CARGO_PKG_VERSION").replacen(".0", "", 1); @@ -10,9 +15,9 @@ fn main() { let mut res = winres::WindowsResource::new(); res.set("ProductVersion", &product_version); res.set_icon("../dist-assets/icon.ico"); - res.set_language(winapi::um::winnt::MAKELANGID( - winapi::um::winnt::LANG_ENGLISH, - winapi::um::winnt::SUBLANG_ENGLISH_US, + res.set_language(make_lang_id( + windows_sys::Win32::System::SystemServices::LANG_ENGLISH as u16, + windows_sys::Win32::System::SystemServices::SUBLANG_ENGLISH_US as u16, )); res.compile().expect("Unable to generate windows resources"); } |