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

Merge pull request from sandr01d/flatpak

Browse Source 
Added flatpak feature
This commit is contained in:
RustDesk 2022-09-13 17:13:10 +08:00 committed by GitHub
commit 9456afd870
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions

1
Cargo.toml

@ -21,6 +21,7 @@ hbbs = []
cli = [] cli = []
with_rc = ["simple_rc"] with_rc = ["simple_rc"]
appimage = [] appimage = []
flatpak = []
use_samplerate = ["samplerate"] use_samplerate = ["samplerate"]
use_rubato = ["rubato"] use_rubato = ["rubato"]
use_dasp = ["dasp"] use_dasp = ["dasp"]

6
src/ui.rs

@ -93,7 +93,11 @@ pub fn start(args: &mut [String]) {
let prefix = std::env::var("APPDIR").unwrap_or("".to_string()); let prefix = std::env::var("APPDIR").unwrap_or("".to_string());
#[cfg(not(feature = "appimage"))] #[cfg(not(feature = "appimage"))]
let prefix = "".to_string(); let prefix = "".to_string();
sciter::set_library(&(prefix + "/usr/lib/rustdesk/libsciter-gtk.so")).ok(); #[cfg(feature = "flatpak")]
let dir = "/app";
#[cfg(not(feature = "flatpak"))]
let dir = "/usr";
sciter::set_library(&(prefix + dir + "/lib/rustdesk/libsciter-gtk.so")).ok();
} }
// https://github.com/c-smile/sciter-sdk/blob/master/include/sciter-x-types.h // https://github.com/c-smile/sciter-sdk/blob/master/include/sciter-x-types.h
// https://github.com/rustdesk/rustdesk/issues/132#issuecomment-886069737 // https://github.com/rustdesk/rustdesk/issues/132#issuecomment-886069737