ci: use build matrix for desktop builds

.github/workflows/build.yaml

@@ -0,0 +1,104 @@
+name: Build
+
+on: [push]
+
+permissions:
+  contents: write
+
+env:
+  RUST_TOOLCHAIN: 1.86.0
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        include:
+          - os: ubuntu-latest
+            target: x86_64-unknown-linux-gnu
+            artifact_name: pacman
+          - os: macos-13
+            target: x86_64-apple-darwin
+            artifact_name: pacman
+          - os: windows-latest
+            target: x86_64-pc-windows-gnu
+            artifact_name: pacman.exe
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Rust Toolchain
+        uses: dtolnay/rust-toolchain@master
+        with:
+          target: ${{ matrix.target }}
+          toolchain: ${{ env.RUST_TOOLCHAIN }}
+
+      - name: Rust Cache
+        uses: Swatinem/rust-cache@v2
+
+      - name: Vcpkg
+        run: |
+          cargo install cargo-vcpkg
+          cargo vcpkg -v build
+      - name: Build
+        run: cargo build --release
+
+      - name: Install Cargo Binstall
+        uses: cargo-bins/cargo-binstall@main
+
+      - name: Acquire Package Version
+        shell: bash
+        run: |
+          cargo binstall toml-cli -y
+          PACKAGE_VERSION=$(toml get ./Cargo.toml package.version --raw)
+          echo "PACKAGE_VERSION=${PACKAGE_VERSION}" >> $GITHUB_ENV
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: "pacman-${{ env.PACKAGE_VERSION }}-${{ matrix.target }}"
+          path: ./target/release/${{ matrix.artifact_name }}
+          retention-days: 7
+          if-no-files-found: error
+
+  wasm:
+    runs-on: ubuntu-latest
+    permissions:
+      pages: write
+      id-token: write
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Emscripten SDK
+        uses: mymindstorm/setup-emsdk@v14
+        with:
+          version: 3.1.43
+
+      - name: Setup Rust (WASM32 Emscripten)
+        uses: dtolnay/rust-toolchain@master
+        with:
+          target: wasm32-unknown-emscripten
+          toolchain: ${{ env.RUST_TOOLCHAIN }}
+
+      - name: Rust Cache
+        uses: Swatinem/rust-cache@v2
+
+      - name: Install pnpm
+        uses: pnpm/action-setup@v3
+        with:
+          version: 8
+          run_install: true
+
+      - name: Build
+        run: ./build.sh -er # release mode, skip emsdk
+
+      - name: Upload Artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: "./dist/"
+          retention-days: 7
+
+      - name: Deploy
+        uses: actions/deploy-pages@v4

.github/workflows/deploy.yaml

@@ -1,231 +0,0 @@
-name: Build
-
-on: [push]
-
-permissions:
-  contents: write
-
-env:
-  RUST_TOOLCHAIN: 1.88.0
-
-jobs:
-  wasm:
-    runs-on: ubuntu-latest
-    permissions:
-      pages: write
-      id-token: write
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup Emscripten SDK
-        uses: mymindstorm/setup-emsdk@v14
-        with:
-          version: 3.1.43
-
-      - name: Setup Rust (WASM32 Emscripten)
-        uses: dtolnay/rust-toolchain@master
-        with:
-          target: wasm32-unknown-emscripten
-          toolchain: ${{ env.RUST_TOOLCHAIN }}
-
-      - name: Rust Cache
-        uses: Swatinem/rust-cache@v2
-
-      - name: Install pnpm
-        uses: pnpm/action-setup@v3
-        with:
-          version: 8
-          run_install: true
-
-      - name: Build
-        run: ./build.sh -er # release mode, skip emsdk
-
-      - name: Upload Artifact
-        uses: actions/upload-pages-artifact@v3
-        with:
-          path: "./dist/"
-          retention-days: 7
-
-      - name: Deploy
-        uses: actions/deploy-pages@v4
-
-  linux:
-    runs-on: ubuntu-latest
-    env:
-      TARGET: x86_64-unknown-linux-gnu
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Install SDL2 Packages
-        run: sudo apt-get install libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev libsdl2-gfx-dev
-
-      - name: Setup Rust Toolchain (Linux)
-        uses: dtolnay/rust-toolchain@master
-        with:
-          target: ${{ env.TARGET }}
-          toolchain: ${{ env.RUST_TOOLCHAIN }}
-
-      - name: Rust Cache
-        uses: Swatinem/rust-cache@v2
-
-      - name: Build
-        run: cargo build --release
-
-      - name: Assemble Archive
-        run: |
-          mkdir /tmp/example/
-          cp ./target/release/pacman /tmp/example/
-          chmod a+x /tmp/example/pacman
-          mkdir /tmp/example/assets
-          cp ./assets/TerminalVector.ttf ./assets/fruit.png /tmp/example/assets
-
-      - name: Install Cargo Binstall
-        uses: cargo-bins/cargo-binstall@main
-
-      - name: Acquire Package Version
-        run: |
-          cargo binstall toml-cli -y
-          PACKAGE_VERSION=$(toml get ./Cargo.toml package.version --raw)
-          echo "PACKAGE_VERSION=${PACKAGE_VERSION}" >> $GITHUB_ENV
-
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: "pacman-${{ env.PACKAGE_VERSION }}-${{ env.TARGET }}"
-          path: /tmp/example/
-          retention-days: 7
-          if-no-files-found: error
-
-  macos:
-    runs-on: macos-13
-    env:
-      TARGET: x86_64-apple-darwin
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Install SDL2 Packages
-        run: brew install sdl2 sdl2_image sdl2_mixer sdl2_ttf sdl2_gfx
-
-      - name: Setup Rust Toolchain (MacOS)
-        uses: dtolnay/rust-toolchain@master
-        with:
-          target: ${{ env.TARGET }}
-          toolchain: ${{ env.RUST_TOOLCHAIN }}
-
-      - name: Rust Cache
-        uses: Swatinem/rust-cache@v2
-
-      - name: Build
-        run: cargo build --release
-
-      - name: Assemble Archive
-        run: |
-          mkdir /tmp/example/
-          cp ./target/release/pacman /tmp/example/
-          mkdir /tmp/example/assets
-          cp ./assets/TerminalVector.ttf ./assets/fruit.png /tmp/example/assets
-
-      - name: Install Cargo Binstall
-        uses: cargo-bins/cargo-binstall@main
-
-      - name: Acquire Package Version
-        run: |
-          cargo binstall toml-cli -y
-          PACKAGE_VERSION=$(toml get ./Cargo.toml package.version --raw)
-          echo "PACKAGE_VERSION=${PACKAGE_VERSION}" >> $GITHUB_ENV
-
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: "pacman-${{ env.PACKAGE_VERSION }}-${{ env.TARGET }}"
-          path: /tmp/example/
-          retention-days: 7
-          if-no-files-found: error
-
-  windows:
-    env:
-      TARGET: x86_64-pc-windows-gnu
-      SDL2: 2.30.2
-      SDL2_TTF: 2.22.0
-      SDL2_MIXER: 2.8.0
-      SDL2_IMAGE: 2.8.2
-      # SDL2_GFX: 1.0.4
-    runs-on: windows-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Download SDL2 Libraries
-        run: |
-          curl -L "https://github.com/libsdl-org/SDL/releases/download/release-${{ env.SDL2 }}/SDL2-devel-${{ env.SDL2 }}-VC.zip" -o "sdl2_devel.zip"
-          curl -L "https://github.com/libsdl-org/SDL_mixer/releases/download/release-${{ env.SDL2_MIXER }}/SDL2_mixer-devel-${{ env.SDL2_MIXER }}-VC.zip" -o "sdl2_mixer_devel.zip"
-          curl -L "https://github.com/libsdl-org/SDL_ttf/releases/download/release-${{ env.SDL2_TTF }}/SDL2_ttf-devel-${{ env.SDL2_TTF }}-VC.zip" -o "sdl2_ttf_devel.zip"
-          curl -L "https://github.com/libsdl-org/SDL_image/releases/download/release-${{ env.SDL2_IMAGE }}/SDL2_image-devel-${{ env.SDL2_IMAGE }}-VC.zip" -o "sdl2_image_devel.zip"
-
-      - name: Extract SDL2 DLLs
-        run: |
-          7z x ./sdl2_devel.zip -o"./tmp/"
-          mv ./tmp/SDL2-${{ env.SDL2 }}/lib/x64/SDL2.dll ./
-          mv ./tmp/SDL2-${{ env.SDL2 }}/lib/x64/SDL2.lib ./
-
-          7z x ./sdl2_mixer_devel.zip -o"./tmp/"
-          mv ./tmp/SDL2_mixer-${{ env.SDL2_MIXER }}/lib/x64/SDL2_mixer.dll ./
-          mv ./tmp/SDL2_mixer-${{ env.SDL2_MIXER }}/lib/x64/SDL2_mixer.lib ./
-
-          7z x ./sdl2_ttf_devel.zip -o"./tmp/"
-          mv ./tmp/SDL2_ttf-${{ env.SDL2_TTF }}/lib/x64/SDL2_ttf.dll ./
-          mv ./tmp/SDL2_ttf-${{ env.SDL2_TTF }}/lib/x64/SDL2_ttf.lib ./
-
-          7z x ./sdl2_image_devel.zip -o"./tmp/"
-          mv ./tmp/SDL2_image-${{ env.SDL2_IMAGE }}/lib/x64/SDL2_image.dll ./
-          mv ./tmp/SDL2_image-${{ env.SDL2_IMAGE }}/lib/x64/SDL2_image.lib ./
-
-      - name: Install SDL2_gfx
-        run: |
-          C:\vcpkg\vcpkg.exe install sdl2-gfx:x64-windows-release
-          cp C:\vcpkg\packages\sdl2-gfx_x64-windows-release\bin\SDL2_gfx.dll ./
-          cp C:\vcpkg\packages\sdl2-gfx_x64-windows-release\lib\SDL2_gfx.lib ./
-
-      - name: Setup Rust (Windows)
-        uses: dtolnay/rust-toolchain@master
-        with:
-          target: ${{ env.TARGET }}
-          toolchain: ${{ env.RUST_TOOLCHAIN }}
-
-      - name: Rust Cache
-        uses: Swatinem/rust-cache@v2
-
-      - name: Build
-        run: cargo build --release
-
-      - name: Prepare Archive
-        run: |
-          New-Item -Type Directory ./release/
-          Move-Item -Path ./target/release/pacman.exe -Destination ./release/
-          Move-Item -Path ./SDL2.dll, ./SDL2_image.dll, ./SDL2_ttf.dll, ./SDL2_mixer.dll, ./SDL2_gfx.dll -Destination ./release/
-          New-Item -Type Directory ./release/assets/
-          Move-Item -Path ./assets/TerminalVector.ttf, ./assets/fruit.png -Destination ./release/assets/
-
-      - name: Install Cargo Binstall
-        uses: cargo-bins/cargo-binstall@main
-
-      - name: Acquire Package Version
-        run: |
-          cargo binstall toml-cli -y
-          PACKAGE_VERSION=$(toml get ./Cargo.toml package.version --raw)
-          echo "PACKAGE_VERSION=${PACKAGE_VERSION}" >> $env:GITHUB_ENV
-
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: "pacman-${{ env.PACKAGE_VERSION }}-${{ env.TARGET }}"
-          path: ./release/
-          retention-days: 7
-          if-no-files-found: error

Cargo.toml

@@ -35,7 +35,7 @@ default-features = false
 features = ["ttf","image","gfx","mixer","static-link","use-vcpkg"]
 
 [package.metadata.vcpkg]
-dependencies = ["sdl2", "sdl2-image[libjpeg-turbo,tiff,libwebp]", "sdl2-ttf", "sdl2-gfx", "sdl2-mixer"]
+dependencies = ["sdl2", "sdl2-image", "sdl2-ttf", "sdl2-gfx", "sdl2-mixer"]
 git = "https://github.com/microsoft/vcpkg"
 rev = "2024.05.24" # release 2024.05.24 # to check for a new one, check https://github.com/microsoft/vcpkg/releases
 

src/asset.rs

@@ -31,6 +31,25 @@ pub enum Asset {
     // Add more as needed
 }
 
+impl Asset {
+    pub fn path(&self) -> &str {
+        use Asset::*;
+        match self {
+            Wav1 => "wav/1.ogg",
+            Wav2 => "wav/2.ogg",
+            Wav3 => "wav/3.ogg",
+            Wav4 => "wav/4.ogg",
+            Pacman => "32/pacman.png",
+            Pellet => "24/pellet.png",
+            Energizer => "24/energizer.png",
+            Map => "map.png",
+            FontKonami => "font/konami.ttf",
+            GhostBody => "32/ghost_body.png",
+            GhostEyes => "32/ghost_eyes.png",
+        }
+    }
+}
+
 #[cfg(not(target_os = "emscripten"))]
 mod imp {
     use super::*;