diff options
| author |   Natsuu <natsukawa247@outlook.com> | 2026-02-15 17:12:48 +0800 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2026-02-15 17:12:48 +0800 |
| commit | 04324a30a50b6333cace6f29996c54744a64d5cc (patch) | |
| tree | 6662b0d95734373d88f651f19bfcceac07b43061 | |
| parent | ee37d044e473217daadd9ce26c7e2e2ad39a0490 (diff) | |
| parent | ab7ad413f893cc2973baed11670408c8a6a3c2e7 (diff) | |
| download | DropOut-04324a30a50b6333cace6f29996c54744a64d5cc.tar.gz DropOut-04324a30a50b6333cace6f29996c54744a64d5cc.zip | |
Merge branch 'HydroRoll-Team:main' into main
| -rw-r--r-- | .github/workflows/semifold-ci.yaml | 12 | ||||
| -rw-r--r-- | src-tauri/Cargo.toml | 3 | ||||
| -rw-r--r-- | src-tauri/build.rs | 6 | ||||
| -rw-r--r-- | src-tauri/icon.rc | 1 |
4 files changed, 16 insertions, 6 deletions
diff --git a/.github/workflows/semifold-ci.yaml b/.github/workflows/semifold-ci.yaml index 9a91518..8aecd90 100644 --- a/.github/workflows/semifold-ci.yaml +++ b/.github/workflows/semifold-ci.yaml @@ -24,12 +24,12 @@ jobs: name: "Linux x86_64 (GNU)" target: "x86_64-unknown-linux-gnu" args: "--target x86_64-unknown-linux-gnu" - - platform: "ubuntu-latest" - name: "Linux x86_64 (Musl)" - target: "x86_64-unknown-linux-musl" - args: "--target x86_64-unknown-linux-musl" - install-musl: true - pkg-config-allow-cross: true + # - platform: "ubuntu-latest" + # name: "Linux x86_64 (Musl)" + # target: "x86_64-unknown-linux-musl" + # args: "--target x86_64-unknown-linux-musl" + # install-musl: true + # pkg-config-allow-cross: true - platform: "ubuntu-24.04-arm" name: "Linux arm64" target: "aarch64-unknown-linux-gnu" diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 6fde40f..224ac28 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -37,6 +37,9 @@ regex = "1.12.2" [build-dependencies] tauri-build = { version = "2.0", features = [] } +[target.'cfg(all(windows, target_env = "gnu"))'.build-dependencies] +embed-resource = "2.4" + [package.metadata.deb] depends = "libgtk-3-0" section = "games" diff --git a/src-tauri/build.rs b/src-tauri/build.rs index d860e1e..63f98e2 100644 --- a/src-tauri/build.rs +++ b/src-tauri/build.rs @@ -1,3 +1,9 @@ fn main() { + // For MinGW targets, use embed-resource to generate proper COFF format + #[cfg(all(windows, target_env = "gnu"))] + { + embed_resource::compile("icon.rc", embed_resource::NONE); + } + tauri_build::build() } diff --git a/src-tauri/icon.rc b/src-tauri/icon.rc new file mode 100644 index 0000000..f5d9048 --- /dev/null +++ b/src-tauri/icon.rc @@ -0,0 +1 @@ +1 ICON "icons/icon.ico" |