From a796e48199ecc581a3406269000f6e1ab6e0b6d1 Mon Sep 17 00:00:00 2001 From: soir20 <71418127+soir20@users.noreply.github.com> Date: Sat, 21 May 2022 16:39:14 -0400 Subject: [PATCH] Statically link vcruntime on Win --- .github/workflows/release.yml | 8 ++++---- Cargo.lock | 9 ++++++++- Cargo.toml | 7 +++++-- build.rs | 3 +++ 4 files changed, 20 insertions(+), 7 deletions(-) create mode 100644 build.rs diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0b92223..941d6e9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -66,12 +66,12 @@ jobs: target: x86_64-unknown-linux-gnu extension: "" description: 64-bit Linux - - os: ubuntu-latest - target: i686-pc-windows-gnu + - os: windows-latest + target: i686-pc-windows-msvc extension: .exe description: 32-bit Windows - - os: ubuntu-latest - target: x86_64-pc-windows-gnu + - os: windows-latest + target: x86_64-pc-windows-msvc extension: .exe description: 64-bit Windows - os: macos-latest diff --git a/Cargo.lock b/Cargo.lock index c39e682..4aad4aa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -224,10 +224,11 @@ dependencies = [ [[package]] name = "frame-reverse" -version = "1.0.0" +version = "1.0.1" dependencies = [ "clap", "image", + "static_vcruntime", ] [[package]] @@ -595,6 +596,12 @@ dependencies = [ "lock_api", ] +[[package]] +name = "static_vcruntime" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "954e3e877803def9dc46075bf4060147c55cd70db97873077232eae0269dc89b" + [[package]] name = "strsim" version = "0.10.0" diff --git a/Cargo.toml b/Cargo.toml index ab8f4e8..ad18521 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,11 +2,14 @@ name = "frame-reverse" description = "CLI to reverse frames in a texture for a MoreMcmeta animation." authors = ["soir20"] -version = "1.0.0" +version = "1.0.1" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] clap = { version = "3.1.15", features = ["derive"] } -image = "0.24.2" \ No newline at end of file +image = "0.24.2" + +[build-dependencies] +static_vcruntime = "2.0.0" \ No newline at end of file diff --git a/build.rs b/build.rs new file mode 100644 index 0000000..9be616d --- /dev/null +++ b/build.rs @@ -0,0 +1,3 @@ +fn main() { + static_vcruntime::metabuild(); +} \ No newline at end of file