Windows build fix + CI

.github/workflows/main.yml

@@ -30,17 +30,59 @@ jobs:
       - name: Run cargo test
         run: cargo test --verbose
 
-      - name: Run cargo bench
-        run: cargo bench --verbose
-
       - name: Run cargo clippy (default)
         run: cargo clippy -- -D warnings
 
       - name: Run cargo clippy (tests)
         run: cargo clippy --tests -- -D warnings
 
+  bench:
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          components: clippy
+
+      - name: Run cargo bench
+        run: cargo bench --verbose
+
       - name: Run cargo clippy (bench bls381_benches)
         run: cargo clippy --bench bls381_benches -- -D warnings
 
       - name: Run cargo clippy (bench multi_verify_benches)
         run: cargo clippy --bench multi_verify_benches -- -D warnings
+
+  build-and-test-windows:
+    runs-on: windows-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          components: clippy
+          targets: x86_64-pc-windows-gnu
+
+      - name: Add MinGW to PATH
+        shell: pwsh
+        run: echo "C:\msys64\mingw64\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+
+      - name: Run cargo test
+        env:
+          CARGO_BUILD_TARGET: x86_64-pc-windows-gnu
+        run: cargo test --verbose
+
+      - name: Run cargo clippy (tests)
+        env:
+          CARGO_BUILD_TARGET: x86_64-pc-windows-gnu
+        run: cargo clippy --tests -- -D warnings

.gitignore

@@ -1,3 +1,4 @@
 target
 Cargo.lock
 CVS
+.DS_Store

Cargo.toml

@@ -17,8 +17,8 @@ categories = ["cryptography"]
 path = "src/lib.rs"
 
 [dependencies]
-criterion = "0.7.0"
-hex = "0.4.0"
+criterion = "0.8"
+hex = "0.4"
 
 [[bench]]
 name = "bls381_benches"

build.rs

@@ -23,10 +23,14 @@ fn main() {
             println!("cargo:rustc-link-lib=static=bls384_256_arm_macos");
             println!("cargo:rustc-link-lib=c++");
         }
-        (_, "windows") => {
+        ("x86_64", "windows") => {
             println!("cargo:rustc-link-search=native=./executors");
-            println!("cargo:rustc-link-lib=static=bls384_256_arm_macos");
-            println!("cargo:rustc-link-lib=stdc++");
+            println!("cargo:rustc-link-lib=static=bls384_256_amd_windows");
+            println!("cargo:rustc-link-lib=advapi32");
+            let env = std::env::var("CARGO_CFG_TARGET_ENV").unwrap_or_default();
+            if env == "gnu" {
+                println!("cargo:rustc-link-lib=stdc++");
+            }
         }
         _ => panic!("Unsupported target: {os}-{target}"),
     }