diff options
| author | elilchen <[email protected]> | 2023-02-16 15:23:31 +0800 |
|---|---|---|
| committer | elilchen <[email protected]> | 2023-02-16 15:23:31 +0800 |
| commit | 388ae586ecb34e57bf6f58ea7dc446b5768a9e0c (patch) | |
| tree | 8579b781f381836349befe6bbfc0dc55d1e6ff70 | |
| parent | fe661fe067ea4c485cfd887b26a7c3962eff52b1 (diff) | |
| download | rustdesk-server-388ae586ecb34e57bf6f58ea7dc446b5768a9e0c.tar.gz rustdesk-server-388ae586ecb34e57bf6f58ea7dc446b5768a9e0c.zip | |
crt-static
| -rw-r--r-- | .cargo/config.toml | 8 | ||||
| -rw-r--r-- | Cargo.lock | 7 | ||||
| -rw-r--r-- | Cargo.toml | 1 | ||||
| -rw-r--r-- | build.rs | 3 | ||||
| -rw-r--r-- | ui/.cargo/config.toml | 8 | ||||
| -rw-r--r-- | ui/Cargo.lock | 9 | ||||
| -rw-r--r-- | ui/Cargo.toml | 1 | ||||
| -rw-r--r-- | ui/build.rs | 1 |
8 files changed, 17 insertions, 21 deletions
diff --git a/.cargo/config.toml b/.cargo/config.toml new file mode 100644 index 0000000..d942d45 --- /dev/null +++ b/.cargo/config.toml @@ -0,0 +1,8 @@ +[target.x86_64-pc-windows-msvc] +rustflags = ["-Ctarget-feature=+crt-static"] +[target.i686-pc-windows-msvc] +rustflags = ["-Ctarget-feature=+crt-static"] +[target.'cfg(target_os="macos")'] +rustflags = [ + "-C", "link-args=-sectcreate __CGPreLoginApp __cgpreloginapp /dev/null", +]
\ No newline at end of file @@ -816,7 +816,6 @@ dependencies = [ "serde_json", "sodiumoxide", "sqlx", - "static_vcruntime", "tokio-tungstenite", "tower-http", "tungstenite", @@ -2094,12 +2093,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] -name = "static_vcruntime" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "954e3e877803def9dc46075bf4060147c55cd70db97873077232eae0269dc89b" - -[[package]] name = "stringprep" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -54,7 +54,6 @@ ping = "0.4.0" [build-dependencies] hbb_common = { path = "libs/hbb_common" } -static_vcruntime = "2.0" [workspace] members = ["libs/hbb_common"] @@ -1,6 +1,3 @@ fn main() { hbb_common::gen_version(); - if cfg!(target_os = "windows") { - static_vcruntime::metabuild(); - } } diff --git a/ui/.cargo/config.toml b/ui/.cargo/config.toml new file mode 100644 index 0000000..d942d45 --- /dev/null +++ b/ui/.cargo/config.toml @@ -0,0 +1,8 @@ +[target.x86_64-pc-windows-msvc] +rustflags = ["-Ctarget-feature=+crt-static"] +[target.i686-pc-windows-msvc] +rustflags = ["-Ctarget-feature=+crt-static"] +[target.'cfg(target_os="macos")'] +rustflags = [ + "-C", "link-args=-sectcreate __CGPreLoginApp __cgpreloginapp /dev/null", +]
\ No newline at end of file diff --git a/ui/Cargo.lock b/ui/Cargo.lock index 6fe161c..8163dae 100644 --- a/ui/Cargo.lock +++ b/ui/Cargo.lock @@ -2315,7 +2315,7 @@ dependencies = [ [[package]] name = "rustdesk_server" -version = "0.1.1" +version = "0.1.2" dependencies = [ "async-std", "crossbeam-channel", @@ -2324,7 +2324,6 @@ dependencies = [ "once_cell", "serde", "serde_json", - "static_vcruntime", "tauri", "tauri-build", "windows-service", @@ -2627,12 +2626,6 @@ dependencies = [ ] [[package]] -name = "static_vcruntime" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "954e3e877803def9dc46075bf4060147c55cd70db97873077232eae0269dc89b" - -[[package]] name = "string_cache" version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/ui/Cargo.toml b/ui/Cargo.toml index 9e2f902..ecb7930 100644 --- a/ui/Cargo.toml +++ b/ui/Cargo.toml @@ -8,7 +8,6 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [build-dependencies] -static_vcruntime = "2.0" tauri-build = { version = "1.2", features = [] } winres = "0.1" diff --git a/ui/build.rs b/ui/build.rs index 250c43b..3cd3d9b 100644 --- a/ui/build.rs +++ b/ui/build.rs @@ -17,6 +17,5 @@ fn main() { "#, ); res.compile().unwrap(); - static_vcruntime::metabuild(); } } |