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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Reza 2022-09-16 11:48:13 -03:00
commit 0aaadd1260
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flutter/macos/Runner/DebugProfile.entitlements
View File

@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>com.apple.security.app-sandbox</key>
<true/>
<false/>
<key>com.apple.security.cs.allow-jit</key>
<true/>
<key>com.apple.security.network.server</key>

2
flutter/macos/Runner/Release.entitlements
View File

@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>com.apple.security.app-sandbox</key>
<true/>
<false/>
<key>com.apple.security.network.client</key>
<true/>
</dict>

8
libs/scrap/build.rs
View File

@ -13,7 +13,13 @@ fn link_vcpkg(mut path: PathBuf, name: &str) -> PathBuf {
target_arch = "arm64".to_owned();
}
let mut target = if target_os == "macos" {
"x64-osx".to_owned()
if target_arch == "x64" {
"x64-osx".to_owned()
} else if target_arch == "arm64"{
"arm64-osx".to_owned()
} else {
format!("{}-{}", target_arch, target_os)
}
} else if target_os == "windows" {
"x64-windows-static".to_owned()
} else {