From 9b1b11fa05e01b920cb2b52b35db07aa9a246471 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Sat, 31 Dec 2022 13:22:19 +0100 Subject: switch to npcap and set a fixed install directory for libs & headers Signed-off-by: Joachim Wiberg --- .github/workflows/build-windows.yml | 4 ++-- win32/msvcbuild.bat | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index 6157b6b..349ae3a 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -12,8 +12,8 @@ jobs: - uses: microsoft/setup-msbuild@v1.1 - name: Install WinPcap run: | - Invoke-WebRequest http://www.winpcap.org/install/bin/WpdPack_4_1_2.zip -OutFile WpdPack.zip - Expand-Archive WpdPack.zip + Invoke-WebRequest https://npcap.com/dist/npcap-sdk-1.13.zip -OutFile WpdPack.zip + Expand-Archive WpdPack.zip -DestinationPath ../WpdPack - name: Build 64-bit shell: cmd run: | diff --git a/win32/msvcbuild.bat b/win32/msvcbuild.bat index 6171703..3a1e0da 100644 --- a/win32/msvcbuild.bat +++ b/win32/msvcbuild.bat @@ -89,10 +89,11 @@ copy win32\config.h include\ copy win32\getopt.h include\ cd src +dir ..\..\..\ +dir ..\..\..\WpdPack dir ..\..\ dir ..\..\WpdPack dir ..\..\WpdPack\Include -type ..\..\WpdPack\Include\Packet32.h @echo "Foo" dir "%WINPCAP%\Include\" %MYCOMPILE% /I..\include /I%WINPCAP%\Include libnet_a*.c libnet_build_*.c libnet_c*.c libnet_dll.c libnet_error.c libnet_i*.c libnet_link_win32.c libnet_p*.c libnet_raw.c libnet_resolve.c libnet_version.c libnet_write.c -- cgit v1.2.1