mirror/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2024-11-27 14:59:02 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

add env VCPKG_INSTALLED_ROOT (#9985)

Browse Source
This commit is contained in:
KAYUII 2024-11-20 19:41:30 +08:00 committed by GitHub
parent 4a49fbe4a6
commit 608d7d55d5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.rs
View File

@ -61,7 +61,11 @@ fn install_android_deps() {
let target = format!("{}-android", target_arch); let target = format!("{}-android", target_arch);
let vcpkg_root = std::env::var("VCPKG_ROOT").unwrap(); let vcpkg_root = std::env::var("VCPKG_ROOT").unwrap();
let mut path: std::path::PathBuf = vcpkg_root.into(); let mut path: std::path::PathBuf = vcpkg_root.into();
path.push("installed"); if let Ok(vcpkg_root) = std::env::var("VCPKG_INSTALLED_ROOT") {
path = vcpkg_root.into();
} else {
path.push("installed");
}
path.push(target); path.push(target);
println!( println!(
"{}", "{}",

6
libs/scrap/build.rs
View File

@ -55,7 +55,11 @@ fn link_vcpkg(mut path: PathBuf, name: &str) -> PathBuf {
target = target.replace("x64", "x86"); target = target.replace("x64", "x86");
} }
println!("cargo:info={}", target); println!("cargo:info={}", target);
path.push("installed"); if let Ok(vcpkg_root) = std::env::var("VCPKG_INSTALLED_ROOT") {
path = vcpkg_root.into();
} else {
path.push("installed");
}
path.push(target); path.push(target);
println!( println!(
"{}", "{}",