From b65b676a55bcdf5796c1613c6dd7cb546827b93f Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Wed, 27 Jul 2022 02:34:21 -0700 Subject: appveyor: go back to the 1.13 Npcap SDK, and add back WinPcap MinGW-w64. This should work with the 1.13 Npcap SDK now that we're not building with MinGW-w64 and the Npcap SDK. Put back the MinGW-w64 build with the WinPcap SDK, as that didn't have a problem (as that SDK hasn't been update in ages and doesn't included any SAL annotations), and as it produces a pile of ugly warnings that we shoould try to eliminate. --- .appveyor.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to '.appveyor.yml') diff --git a/.appveyor.yml b/.appveyor.yml index 4025a6cd..e4f6de9e 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -15,13 +15,18 @@ install: - win_bison --version - appveyor DownloadFile https://www.winpcap.org/install/bin/WpdPack_4_1_2.zip - 7z x .\WpdPack_4_1_2.zip -oc:\projects\libpcap\Win32 - - appveyor DownloadFile https://npcap.com/dist/npcap-sdk-1.12.zip - - 7z x .\npcap-sdk-1.12.zip -oc:\projects\libpcap\Win32\npcap-sdk-1.12 + - appveyor DownloadFile https://npcap.com/dist/npcap-sdk-1.13.zip + - 7z x .\npcap-sdk-1.13.zip -oc:\projects\libpcap\Win32\npcap-sdk-1.13 - appveyor DownloadFile https://support.riverbed.com/bin/support/download?sid=l3vk3eu649usgu3rj60uncjqqu -FileName AirPcap_Devpack.zip - 7z x .\AirPcap_Devpack.zip -oc:\projects\libpcap\Win32 environment: matrix: + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + GENERATOR: "MinGW Makefiles" + SDK: WpdPack + AIRPCAP: -DDISABLE_AIRPCAP=YES + MINGW_ROOT: C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 GENERATOR: "Visual Studio 14 2015 Win64" SDK: WpdPack -- cgit v1.2.1