From de12251d2537c43ff784a618140844d45ad4f47b Mon Sep 17 00:00:00 2001
From: Mateusz Faderewski <sc@mateuszfaderewski.pl>
Date: Thu, 27 Jun 2024 21:56:40 +0200
Subject: [PATCH] maybe

---
 .github/workflows/build.yml | 36 +++++++++++++++---------------------
 sw/deployer/Cargo.lock      | 14 ++++++++++++++
 sw/deployer/Cargo.toml      |  3 ++-
 3 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a1a691a..af4ea64 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -52,27 +52,26 @@ jobs:
   build-deployer:
     strategy:
       matrix:
-        # version: [windows, windows-32bit, linux, macos]
-        version: [linux, macos]
+        version: [windows, windows-32bit, linux, macos]
         include:
-          # - version: windows
-          #   os: windows-latest
-          #   executable: target/release/sc64deployer.exe
-          #   package-name: sc64-deployer-windows
-          #   package-params: -c -a -f
-          #   package-extension: zip
+          - version: windows
+            os: windows-latest
+            executable: target/release/sc64deployer.exe
+            package-name: sc64-deployer-windows
+            package-params: -c -a -f
+            package-extension: zip
 
-          # - version: windows-32bit
-          #   os: windows-latest
-          #   build-params: --target=i686-pc-windows-msvc
-          #   executable: target/i686-pc-windows-msvc/release/sc64deployer.exe
-          #   package-name: sc64-deployer-windows-32bit
-          #   package-params: -c -a -f
-          #   package-extension: zip
+          - version: windows-32bit
+            os: windows-latest
+            build-params: --target=i686-pc-windows-msvc
+            executable: target/i686-pc-windows-msvc/release/sc64deployer.exe
+            package-name: sc64-deployer-windows-32bit
+            package-params: -c -a -f
+            package-extension: zip
 
           - version: linux
             os: ubuntu-latest
-            apt-packages: libftdi1-dev libudev-dev
+            apt-packages: libudev-dev
             executable: target/release/sc64deployer
             package-name: sc64-deployer-linux
             package-params: -czf
@@ -80,7 +79,6 @@ jobs:
 
           - version: macos
             os: macos-latest
-            brew-packages: libftdi
             executable: target/release/sc64deployer
             package-name: sc64-deployer-macos
             package-params: -czf
@@ -106,10 +104,6 @@ jobs:
           sudo apt-get update
           sudo apt-get -y install ${{ matrix.apt-packages }}
 
-      - name: Install brew packages
-        if: matrix.brew-packages
-        run: brew install ${{ matrix.brew-packages }}
-
       - name: Build deployer
         run: cargo b -r ${{ matrix.build-params }}
         working-directory: sw/deployer
diff --git a/sw/deployer/Cargo.lock b/sw/deployer/Cargo.lock
index 41f9d6a..9ec0afe 100644
--- a/sw/deployer/Cargo.lock
+++ b/sw/deployer/Cargo.lock
@@ -739,6 +739,7 @@ dependencies = [
  "cfg-if",
  "libc",
  "libftdi1-source-lgpl",
+ "libusb1-sys",
  "pkg-config",
  "vcpkg",
 ]
@@ -774,6 +775,18 @@ dependencies = [
  "pkg-config",
 ]
 
+[[package]]
+name = "libusb1-sys"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17f6bace2f39082e9787c851afce469e7b2fe0f1cc64bbc68ca96653b63d8f17"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+ "vcpkg",
+]
+
 [[package]]
 name = "lock_api"
 version = "0.4.12"
@@ -1221,6 +1234,7 @@ dependencies = [
  "image",
  "include-flate",
  "libftdi1-sys",
+ "libusb1-sys",
  "md5",
  "panic-message",
  "rand",
diff --git a/sw/deployer/Cargo.toml b/sw/deployer/Cargo.toml
index 843b5c5..98cbfd3 100644
--- a/sw/deployer/Cargo.toml
+++ b/sw/deployer/Cargo.toml
@@ -17,7 +17,8 @@ encoding_rs = "0.8.34"
 hex = "0.4.3"
 image = "0.25.1"
 include-flate = { version = "0.2.0", features = ["stable"] }
-libftdi1-sys = { version = "1.1.3", features = ["vendored"] }
+libftdi1-sys = { version = "1.1.3", features = ["libusb1-sys", "vendored"] }
+libusb1-sys = { version = "0.6.5", features = ["vendored"] }
 md5 = "0.7.0"
 panic-message = "0.3.0"
 rand = "0.8.5"