Skip to content

Commit 8a363aa

Browse files
authored
Temporarily disable Npcap and use WinPcap instead (#1903)
* Temporarily disable Npcap and use WinPcap instead * Try to fix MinGW
1 parent 8ded9f0 commit 8a363aa

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

.github/workflows/build_and_test.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -499,8 +499,10 @@ jobs:
499499
include:
500500
- env: i686
501501
sys: mingw32
502+
pcap_lib: "winpcap"
502503
- env: x86_64
503504
sys: mingw64
505+
pcap_lib: "winpcap"
504506

505507
steps:
506508
- name: Checkout code
@@ -528,11 +530,18 @@ jobs:
528530
run: |
529531
ci\install_npcap.bat
530532
echo "PCAP_SDK_DIR=/C/Npcap-sdk" >> $env:GITHUB_ENV
533+
if: matrix.pcap_lib == 'npcap'
534+
535+
- name: Install WinPcap
536+
run: |
537+
ci\install_winpcap.bat
538+
echo "PCAP_SDK_DIR=/C/WpdPack" >> $env:GITHUB_ENV
539+
if: matrix.pcap_lib == 'winpcap'
531540

532541
- name: Configure PcapPlusPlus
533542
shell: msys2 {0}
534543
run: |
535-
cmake -G "MinGW Makefiles" -DPCAP_ROOT=/C/Npcap-sdk -DLIGHT_PCAPNG_ZSTD=OFF -DPCAPPP_BUILD_COVERAGE=ON -S . -B "$BUILD_DIR"
544+
cmake -G "MinGW Makefiles" -DPCAP_ROOT=${{ env.PCAP_SDK_DIR }} -DLIGHT_PCAPNG_ZSTD=OFF -DPCAPPP_BUILD_COVERAGE=ON -S . -B "$BUILD_DIR"
536545
537546
- name: Build PcapPlusPlus
538547
shell: msys2 {0}
@@ -581,15 +590,15 @@ jobs:
581590
- os: windows-2025
582591
platform: "Visual Studio 17 2022"
583592
arch: Win32
584-
pcap_lib: "npcap"
593+
pcap_lib: "winpcap"
585594
- os: windows-2025
586595
platform: "Visual Studio 17 2022"
587596
arch: "x64"
588597
pcap_lib: "winpcap"
589598
- os: windows-2022
590599
platform: "Visual Studio 17 2022"
591600
arch: "x64"
592-
pcap_lib: "npcap"
601+
pcap_lib: "winpcap"
593602

594603
runs-on: ${{ matrix.os }}
595604
steps:

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,7 @@ endif()
298298
if(MINGW)
299299
add_link_options(-static-libgcc -static-libstdc++)
300300
add_link_options(-static)
301+
add_compile_options(-Wno-unused-function)
301302
endif()
302303

303304
if(PCAPPP_TARGET_COMPILER_MSVC)

0 commit comments

Comments
 (0)