Using pcap instead of wpcap

xfangfang · May 13, 2024 · 912cc5a · 912cc5a
1 parent 1bca1e8
commit 912cc5a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -31,7 +31,7 @@ jobs:
           - { target: x86_64-macos-none,  os: macos-13     , strip: "strip",      upx: "ls" }
           - { target: aarch64-macos-none, os: macos-14     , strip: "strip",      upx: "ls" }
           - { target: x86_64-windows-gnu, os: ubuntu-latest, strip: "llvm-strip", upx: "upx --lzma",
-              cmake: "-DPCAP_ROOT=/tmp/sdk", ext: ".exe", name: "(ucrt)" }
+              cmake: "-DUSE_SYSTEM_PCAP=OFF -DPCAP_ROOT=/tmp/sdk", ext: ".exe", name: "(ucrt)" }
           - { target: x86_64-linux-musl,  os: ubuntu-latest, strip: "llvm-strip", upx: "upx --lzma",
               cmake: "-DUSE_SYSTEM_PCAP=OFF" }
           - { target: aarch64-linux-musl, os: ubuntu-latest, strip: "llvm-strip", upx: "upx --lzma",

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -61,7 +61,8 @@ else ()
         # Fix zig cross-compiling issue
         set(CMAKE_USE_PTHREADS_INIT ON)
         set(PPPWN_PCAP_DIRECTION OFF)
-    elseif (NOT USE_SYSTEM_PCAP)
+    endif()
+    if (NOT USE_SYSTEM_PCAP)
         include(FetchContent)
         set(DISABLE_DBUS ON)
         set(DISABLE_RDMA ON)