diff --git a/Cargo.lock b/Cargo.lock index 9d9a8fa..1dd561d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -187,9 +187,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.66" +version = "1.0.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48" +checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" [[package]] name = "cfg-if" diff --git a/espanso-clipboard/Cargo.toml b/espanso-clipboard/Cargo.toml index b389613..943588f 100644 --- a/espanso-clipboard/Cargo.toml +++ b/espanso-clipboard/Cargo.toml @@ -28,4 +28,4 @@ widestring = "0.4.3" wait-timeout = { version = "0.2.0", optional = true } [build-dependencies] -cc = "1.0.66" \ No newline at end of file +cc = "1.0.73" \ No newline at end of file diff --git a/espanso-detect/Cargo.toml b/espanso-detect/Cargo.toml index ae760fd..b97c457 100644 --- a/espanso-detect/Cargo.toml +++ b/espanso-detect/Cargo.toml @@ -27,7 +27,7 @@ scopeguard = "1.1.0" sctk = { package = "smithay-client-toolkit", version = "0.14.0", optional = true } [build-dependencies] -cc = "1.0.66" +cc = "1.0.73" [dev-dependencies] enum-as-inner = "0.3.3" \ No newline at end of file diff --git a/espanso-info/Cargo.toml b/espanso-info/Cargo.toml index 56aa979..2a19659 100644 --- a/espanso-info/Cargo.toml +++ b/espanso-info/Cargo.toml @@ -20,4 +20,4 @@ lazy_static = "1.4.0" widestring = "0.4.3" [build-dependencies] -cc = "1.0.66" \ No newline at end of file +cc = "1.0.73" \ No newline at end of file diff --git a/espanso-inject/Cargo.toml b/espanso-inject/Cargo.toml index 5a0c9a0..c7724be 100644 --- a/espanso-inject/Cargo.toml +++ b/espanso-inject/Cargo.toml @@ -27,7 +27,7 @@ scopeguard = "1.1.0" itertools = "0.10.0" [build-dependencies] -cc = "1.0.66" +cc = "1.0.73" [dev-dependencies] enum-as-inner = "0.3.3" \ No newline at end of file diff --git a/espanso-mac-utils/Cargo.toml b/espanso-mac-utils/Cargo.toml index 6172e9c..cd47a4b 100644 --- a/espanso-mac-utils/Cargo.toml +++ b/espanso-mac-utils/Cargo.toml @@ -14,4 +14,4 @@ lazy_static = "1.4.0" regex = "1.4.3" [build-dependencies] -cc = "1.0.66" \ No newline at end of file +cc = "1.0.73" \ No newline at end of file diff --git a/espanso-modulo/Cargo.toml b/espanso-modulo/Cargo.toml index a6f3ea5..332c043 100644 --- a/espanso-modulo/Cargo.toml +++ b/espanso-modulo/Cargo.toml @@ -15,7 +15,7 @@ lazy_static = "1.4.0" regex = "1.4.3" [build-dependencies] -cc = "1.0.66" +cc = "1.0.73" regex = "1.4.3" zip = "0.5.12" winres = "0.1.11" diff --git a/espanso-ui/Cargo.toml b/espanso-ui/Cargo.toml index 1194758..e1d5b3d 100644 --- a/espanso-ui/Cargo.toml +++ b/espanso-ui/Cargo.toml @@ -31,4 +31,4 @@ notify-rust = "4.2.2" crossbeam = "0.8.0" [build-dependencies] -cc = "1.0.66" \ No newline at end of file +cc = "1.0.73" \ No newline at end of file diff --git a/scripts/build_windows_resources.rs b/scripts/build_windows_resources.rs index 0c11750..a2b4de1 100644 --- a/scripts/build_windows_resources.rs +++ b/scripts/build_windows_resources.rs @@ -1,6 +1,6 @@ //! ```cargo //! [dependencies] -//! cc = "1.0.66" +//! cc = "1.0.73" //! glob = "0.3.0" //! envmnt = "*" //! ``` @@ -54,14 +54,21 @@ fn main() { .next() .expect("unable to find vcruntime140_1.dll file") .expect("unable to extract path of vcruntime140_1.dll file"); - + // Copy the DLLs in the target directory - let parent_dir = target_file.parent().expect("unable to obtain directory containing DLLs"); - for entry in glob::glob(&format!(r"{}\*.dll", parent_dir.to_string_lossy().to_string())).expect("unable to glob over DLLs") { + let parent_dir = target_file + .parent() + .expect("unable to obtain directory containing DLLs"); + for entry in glob::glob(&format!( + r"{}\*.dll", + parent_dir.to_string_lossy().to_string() + )) + .expect("unable to glob over DLLs") + { let entry = entry.expect("unable to unwrap DLL entry"); let filename = entry.file_name().expect("unable to obtain filename"); std::fs::copy(&entry, target_dir.join(filename)).expect("unable to copy DLL"); - } + } // Copy the executable let exec_path = envmnt::get_or_panic("EXEC_PATH");