From e1736306872dd264e802f501d0645fd78ba2a092 Mon Sep 17 00:00:00 2001
From: Joachim Wiberg <troglobit@gmail.com>
Date: Sat, 31 Dec 2022 15:34:57 +0100
Subject: .github: enable matrix bulder for 32/64-bit builds

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
 .github/workflows/build-windows.yml | 14 ++++++--------
 win32/msvcbuild.bat                 |  2 +-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index ce2068e..6dbd844 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -6,6 +6,8 @@ jobs:
   windows-build:
     runs-on: windows-2019
     strategy:
+      matrix:
+        arch: [x86, x86_64]
       fail-fast: false
     steps:
       - uses: actions/checkout@v3
@@ -14,16 +16,12 @@ jobs:
         run: |
           Invoke-WebRequest https://npcap.com/dist/npcap-sdk-1.13.zip -OutFile ../npcap-sdk.zip
           Expand-Archive ../npcap-sdk.zip -DestinationPath ../npcap-sdk
-      - name: Build 32-bit
+      - name: Build ${{ matrix.arch }}
         shell: cmd
         run: |
-          .\win32\msvcbuild.bat x86
-      - name: Build 64-bit
-        shell: cmd
-        run: |
-          .\win32\msvcbuild.bat x86_64
+          .\win32\msvcbuild.bat ${{ matrix.arch }}
       - name: Archive DLL files
         uses: actions/upload-artifact@v3
         with:
-          name: libnet-${{ github.run_number }}
-          path: lib/*
+          name: libnet-${{ matrix.arch }}-build${{ github.run_number }}
+          path: lib/${{ matrix.arch }}
diff --git a/win32/msvcbuild.bat b/win32/msvcbuild.bat
index d41a7dc..76a5978 100644
--- a/win32/msvcbuild.bat
+++ b/win32/msvcbuild.bat
@@ -52,7 +52,7 @@ call "%InstallDir%\Common7\Tools\VsDevCmd.bat" -arch=amd64
 set PCAPLIB=%NPCAP%\Lib\x64
 set PCAPINC=%NPCAP%\Include
 set OBJDIR=win64
-set LIBDIR=..\lib\x64
+set LIBDIR=..\lib\x86_64
 goto msvcbuild
 
 :msvcbuild
-- 
cgit v1.2.1