Update targets

.cargo/config.toml

@@ -0,0 +1,2 @@
+[target.aarch64-unknown-linux-gnu]
+linker="aarch64-linux-gnu-gcc"

.github/workflows/rimage.yml

@@ -19,8 +19,8 @@ jobs:
         target:
           - x86_64-unknown-linux-gnu
           - aarch64-unknown-linux-gnu
-          - x86_64-pc-windows-msvc
-          - i686-pc-windows-msvc
+          - x86_64-pc-windows-gnu
+          - i686-pc-windows-gnu
           - x86_64-apple-darwin
           - aarch64-apple-darwin
 
@@ -31,9 +31,9 @@ jobs:
           - target: aarch64-unknown-linux-gnu
             os: ubuntu-latest
             target-apt-arch: arm64
-          - target: x86_64-pc-windows-msvc
+          - target: x86_64-pc-windows-gnu
             os: windows-latest
-          - target: i686-pc-windows-msvc
+          - target: i686-pc-windows-gnu
             os: windows-latest
           - target: x86_64-apple-darwin
             os: macos-latest
@@ -75,6 +75,10 @@ jobs:
       - name: Setup nasm 🧑‍💻
         uses: ilammy/setup-nasm@v1
 
+      - name: Setup libjxl 🧑‍💻 (macos)
+        if: startsWith(matrix.os, 'macos')
+        run: brew install jpeg-xl
+
       - name: Setup rust toolchain 🦀
         uses: actions-rs/toolchain@v1
         with:

Cargo.toml

@@ -73,12 +73,17 @@ features = ["codec-aom"]
 default-features = false
 optional = true
 
-[dependencies.jpegxl-rs]
+[target.'cfg(not(macos))'.dependencies.jpegxl-rs]
 version = "0.8.2+libjxl-0.8.2"
 default-features = false
 features = ["vendored"]
 optional = true
 
+[target.'cfg(macos)'.dependencies.jpegxl-rs]
+version = "0.8.2+libjxl-0.8.2"
+default-features = false
+optional = true
+
 [target.'cfg(windows)'.dependencies.glob]
 optional = true
 version = "0.3.1"