crt-static

This commit is contained in:
elilchen 2023-02-16 15:23:31 +08:00
parent fe661fe067
commit 388ae586ec
8 changed files with 17 additions and 21 deletions

8
.cargo/config.toml Normal file
View File

@ -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",
]

7
Cargo.lock generated
View File

@ -816,7 +816,6 @@ dependencies = [
"serde_json", "serde_json",
"sodiumoxide", "sodiumoxide",
"sqlx", "sqlx",
"static_vcruntime",
"tokio-tungstenite", "tokio-tungstenite",
"tower-http", "tower-http",
"tungstenite", "tungstenite",
@ -2093,12 +2092,6 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
[[package]]
name = "static_vcruntime"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "954e3e877803def9dc46075bf4060147c55cd70db97873077232eae0269dc89b"
[[package]] [[package]]
name = "stringprep" name = "stringprep"
version = "0.1.2" version = "0.1.2"

View File

@ -54,7 +54,6 @@ ping = "0.4.0"
[build-dependencies] [build-dependencies]
hbb_common = { path = "libs/hbb_common" } hbb_common = { path = "libs/hbb_common" }
static_vcruntime = "2.0"
[workspace] [workspace]
members = ["libs/hbb_common"] members = ["libs/hbb_common"]

View File

@ -1,6 +1,3 @@
fn main() { fn main() {
hbb_common::gen_version(); hbb_common::gen_version();
if cfg!(target_os = "windows") {
static_vcruntime::metabuild();
}
} }

8
ui/.cargo/config.toml Normal file
View File

@ -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",
]

9
ui/Cargo.lock generated
View File

@ -2315,7 +2315,7 @@ dependencies = [
[[package]] [[package]]
name = "rustdesk_server" name = "rustdesk_server"
version = "0.1.1" version = "0.1.2"
dependencies = [ dependencies = [
"async-std", "async-std",
"crossbeam-channel", "crossbeam-channel",
@ -2324,7 +2324,6 @@ dependencies = [
"once_cell", "once_cell",
"serde", "serde",
"serde_json", "serde_json",
"static_vcruntime",
"tauri", "tauri",
"tauri-build", "tauri-build",
"windows-service", "windows-service",
@ -2626,12 +2625,6 @@ dependencies = [
"loom", "loom",
] ]
[[package]]
name = "static_vcruntime"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "954e3e877803def9dc46075bf4060147c55cd70db97873077232eae0269dc89b"
[[package]] [[package]]
name = "string_cache" name = "string_cache"
version = "0.8.4" version = "0.8.4"

View File

@ -8,7 +8,6 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[build-dependencies] [build-dependencies]
static_vcruntime = "2.0"
tauri-build = { version = "1.2", features = [] } tauri-build = { version = "1.2", features = [] }
winres = "0.1" winres = "0.1"

View File

@ -17,6 +17,5 @@ fn main() {
"#, "#,
); );
res.compile().unwrap(); res.compile().unwrap();
static_vcruntime::metabuild();
} }
} }