konevsa/rustdesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

force to use static link for Manjaro

Browse Source
This commit is contained in:
rustdesk 2021-05-02 00:37:32 +08:00
parent 335ec619d9
commit 547b85adbf
4 changed files with 247 additions and 762 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

997
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

4
README.md
View File

@ -30,14 +30,14 @@ Desktop versions use [sciter](https://sciter.com/) for GUI, please download scit
sudo apt install -y g++ gcc git curl wget nasm yasm libgtk-3-dev clang libxcb-randr0-dev libxdo-dev libxfixes-dev libxcb-shape0-dev libxcb-xfixes0-dev libasound2-dev libpulse-dev cmake sudo apt install -y g++ gcc git curl wget nasm yasm libgtk-3-dev clang libxcb-randr0-dev libxdo-dev libxfixes-dev libxcb-shape0-dev libxcb-xfixes0-dev libasound2-dev libpulse-dev cmake
``` ```
### Fedora 28 ### Fedora 28 (CentOS 8)
``` ```
sudo yum -y install gcc-c++ git curl wget nasm yasm gcc gtk3-devel clang libxcb-devel libxdo-devel libXfixes-devel pulseaudio-libs-devel cmake alsa-lib-devel sudo yum -y install gcc-c++ git curl wget nasm yasm gcc gtk3-devel clang libxcb-devel libxdo-devel libXfixes-devel pulseaudio-libs-devel cmake alsa-lib-devel
``` ```
### Arch (Manjaro) ### Arch (Manjaro)
``` ```
sudo pacman -Syu unzip git cmake gcc curl wget yasm zip make pkg-config clang gtk3 xdotool libxcb libxfixes alsa-lib pulseaudio sudo pacman -Syu unzip git cmake gcc curl wget yasm nasm zip make pkg-config clang gtk3 xdotool libxcb libxfixes alsa-lib pulseaudio
``` ```
### Install vcpkg ### Install vcpkg

2
libs/scrap/build.rs
View File

@ -31,7 +31,7 @@ fn find_package(name: &str) -> Vec<PathBuf> {
if lib == "vpx" && target_os == "windows" { if lib == "vpx" && target_os == "windows" {
lib = format!("{}mt", lib); lib = format!("{}mt", lib);
} }
println!("{}", format!("cargo:rustc-link-lib={}", lib)); println!("{}", format!("cargo:rustc-link-lib=static={}", lib));
println!( println!(
"{}", "{}",
format!( format!(

6
src/server/video_service.rs
View File

@ -73,7 +73,11 @@ fn run(sp: GenericService) -> ResultType<()> {
rc_max_quantizer, rc_max_quantizer,
speed, speed,
}; };
let mut vpx = Encoder::new(&cfg, 1).with_context(|| "Failed to create encoder")?; let mut vpx;
match Encoder::new(&cfg, 1) {
Ok(x) => vpx = x,
Err(err) => bail!("Failed to create encoder: {}", err),
}
if *SWITCH.lock().unwrap() { if *SWITCH.lock().unwrap() {
log::debug!("Broadcasting display switch"); log::debug!("Broadcasting display switch");