From 5ec1c6e36e1f23f76701570d9ecb2a1a742b2c32 Mon Sep 17 00:00:00 2001
From: Florian Reimold <11774314+FlorianReimold@users.noreply.github.com>
Date: Wed, 14 May 2025 08:24:03 +0200
Subject: [PATCH] Updated udpcap to 2.0.2

- Updated udpcap
- GH Actions: Upgraded windows build pipeline to VS 2019
- GH Actions: Improved builds by always building against static libs
---
 .github/workflows/build-ubuntu.yml  | 6 +++---
 .github/workflows/build-windows.yml | 8 ++++++--
 thirdparty/udpcap                   | 2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml
index 9114b4f..42667f7 100644
--- a/.github/workflows/build-ubuntu.yml
+++ b/.github/workflows/build-ubuntu.yml
@@ -27,16 +27,16 @@ jobs:
 
     - name: Set Variables
       run: |
+        # dependencies are always supposed to be built shared, so we set the BUILD_SHARED_LIBS to OFF
+        echo "build_shared_libs=OFF"        >> "$GITHUB_ENV"
+        
         if [[ '${{ matrix.library_type }}' == 'static' ]]; then
-          echo "build_shared_libs=OFF"        >> "$GITHUB_ENV"
           echo "ecaludp_library_type=STATIC"  >> "$GITHUB_ENV"
           echo "package_postfix=static"       >> "$GITHUB_ENV"
         elif [[ '${{ matrix.library_type }}' == 'shared' ]]; then
-          echo "build_shared_libs=ON"         >> "$GITHUB_ENV"
           echo "ecaludp_library_type=SHARED"  >> "$GITHUB_ENV"
           echo "package_postfix=shared"       >> "$GITHUB_ENV"
         elif [[ '${{ matrix.library_type }}' == 'object' ]]; then
-          echo "build_shared_libs=OFF"        >> "$GITHUB_ENV"
           echo "ecaludp_library_type=OBJECT"  >> "$GITHUB_ENV"
           echo "package_postfix=object"       >> "$GITHUB_ENV"
         fi
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index ac76845..8f9c371 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -9,8 +9,8 @@ env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
   INSTALL_PREFIX: _install
   PROJECT_NAME:   ecaludp
-  VS_TOOLSET:     v141
-  VS_NAME:        vs2017
+  VS_TOOLSET:     v142
+  VS_NAME:        vs2019
 
 jobs:
   build-windows:
@@ -31,6 +31,9 @@ jobs:
 
     - name: Set Variables
       run: |
+        # dependencies are always supposed to be built shared, so we set the BUILD_SHARED_LIBS to OFF
+        echo "build_shared_libs=OFF"         >> "$Env:GITHUB_ENV"
+      
         if ( '${{ matrix.library_type }}' -eq 'static' )
         {
           echo "ecaludp_library_type=STATIC" >> "$Env:GITHUB_ENV"
@@ -83,6 +86,7 @@ jobs:
                  -DECALUDP_LIBRARY_TYPE=${{env.ecaludp_library_type}} ^
                  -DECALUDP_ENABLE_NPCAP=${{ matrix.npcap_enabled }} ^
                  -DCMAKE_CXX_FLAGS=/DASIO_NO_DEPRECATED ^
+                 -DBUILD_SHARED_LIBS=${{ env.build_shared_libs }} ^
                  -DCMAKE_INSTALL_PREFIX=${{env.INSTALL_PREFIX}}
 
     - name: Build (Release)
diff --git a/thirdparty/udpcap b/thirdparty/udpcap
index a381b68..3ef9b2c 160000
--- a/thirdparty/udpcap
+++ b/thirdparty/udpcap
@@ -1 +1 @@
-Subproject commit a381b681af0559605d48421da18636b3964d861f
+Subproject commit 3ef9b2cc28db3f1298c3e489f5ff1eb8975cffc7