Update libpcap to 1.9.0, using CMake to build. See nmap/nmap#1506

installer/Build.bat

@@ -11,5 +11,8 @@ msbuild "%NPCAPDIR%\packetWin7\vs14\npcap.sln" /m /t:Build /p:Configuration="%MO
 msbuild "%NPCAPDIR%\packetWin7\vs14\npcap.sln" /m /t:Build /p:Configuration="%MODE% No NetMon and AirPcap%%28WinPcap Mode%%29" /p:Platform="x86"
 msbuild "%NPCAPDIR%\packetWin7\vs14\npcap.sln" /m /t:Build /p:Configuration="%MODE% No NetMon and AirPcap%%28WinPcap Mode%%29" /p:Platform="x64"
 
+msbuild "%NPCAPDIR%\wpcap\build-win32\wpcap.vcxproj" /m /t:Build /p:Configuration="%MODE%" /p:Platform="Win32"
+msbuild "%NPCAPDIR%\wpcap\build-x64\wpcap.vcxproj" /m /t:Build /p:Configuration="%MODE%" /p:Platform="x64"
+
 pause
 

packetWin7/vs14/npcap.sln

@@ -7,8 +7,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "npf", "..\npf\npf\npf.vcxpr
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "npf Package", "..\npf\npf Package\npf Package.vcxproj", "{1A6BC1F1-F16A-4653-B787-FAF5A0E50229}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wpcap", "..\..\wpcap\libpcap\Win32\Prj\wpcap.vcxproj", "{8E92D840-6A36-452A-A13C-6E1BA5A2C5A9}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Packet", "..\Dll\Project\Packet.vcxproj", "{17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NpcapHelper", "..\Helper\NpcapHelper\NpcapHelper.vcxproj", "{917BE5CC-CE5E-4476-A9E7-3B1F96E9FC43}"
@@ -133,38 +131,6 @@ Global
 		{1A6BC1F1-F16A-4653-B787-FAF5A0E50229}.Release|x86.ActiveCfg = Win7 Release SDV|Win32
 		{1A6BC1F1-F16A-4653-B787-FAF5A0E50229}.Release|x86.Build.0 = Win7 Release SDV|Win32
 		{1A6BC1F1-F16A-4653-B787-FAF5A0E50229}.Release|x86.Deploy.0 = Win7 Release SDV|Win32
-		{8E92D840-6A36-452A-A13C-6E1BA5A2C5A9}.Debug No NetMon and AirPcap(WinPcap Mode)|x64.ActiveCfg = Debug|x64
-		{8E92D840-6A36-452A-A13C-6E1BA5A2C5A9}.Debug No NetMon and AirPcap(WinPcap Mode)|x64.Build.0 = Debug|x64
-		{8E92D840-6A36-452A-A13C-6E1BA5A2C5A9}.Debug No NetMon and AirPcap(WinPcap Mode)|x86.ActiveCfg = Debug|Win32
-		{8E92D840-6A36-452A-A13C-6E1BA5A2C5A9}.Debug No NetMon and AirPcap(WinPcap Mode)|x86.Build.0 = Debug|Win32
-		{8E92D840-6A36-452A-A13C-6E1BA5A2C5A9}.Debug No NetMon and AirPcap|x64.ActiveCfg = Debug|x64
-		{8E92D840-6A36-452A-A13C-6E1BA5A2C5A9}.Debug No NetMon and AirPcap|x64.Build.0 = Debug|x64
-		{8E92D840-6A36-452A-A13C-6E1BA5A2C5A9}.Debug No NetMon and AirPcap|x86.ActiveCfg = Debug|Win32
-		{8E92D840-6A36-452A-A13C-6E1BA5A2C5A9}.Debug No NetMon and AirPcap|x86.Build.0 = Debug|Win32
-		{8E92D840-6A36-452A-A13C-6E1BA5A2C5A9}.Debug|x64.ActiveCfg = Debug|x64
-		{8E92D840-6A36-452A-A13C-6E1BA5A2C5A9}.Debug|x64.Build.0 = Debug|x64
-		{8E92D840-6A36-452A-A13C-6E1BA5A2C5A9}.Debug|x86.ActiveCfg = Debug|Win32
-		{8E92D840-6A36-452A-A13C-6E1BA5A2C5A9}.Debug|x86.Build.0 = Debug|Win32
-		{8E92D840-6A36-452A-A13C-6E1BA5A2C5A9}.OEM Release No NetMon and AirPcap(WinPcap Mode)|x64.ActiveCfg = Release|x64
-		{8E92D840-6A36-452A-A13C-6E1BA5A2C5A9}.OEM Release No NetMon and AirPcap(WinPcap Mode)|x64.Build.0 = Release|x64
-		{8E92D840-6A36-452A-A13C-6E1BA5A2C5A9}.OEM Release No NetMon and AirPcap(WinPcap Mode)|x86.ActiveCfg = Release|Win32
-		{8E92D840-6A36-452A-A13C-6E1BA5A2C5A9}.OEM Release No NetMon and AirPcap(WinPcap Mode)|x86.Build.0 = Release|Win32
-		{8E92D840-6A36-452A-A13C-6E1BA5A2C5A9}.OEM Release No NetMon and AirPcap|x64.ActiveCfg = Release|x64
-		{8E92D840-6A36-452A-A13C-6E1BA5A2C5A9}.OEM Release No NetMon and AirPcap|x64.Build.0 = Release|x64
-		{8E92D840-6A36-452A-A13C-6E1BA5A2C5A9}.OEM Release No NetMon and AirPcap|x86.ActiveCfg = Release|Win32
-		{8E92D840-6A36-452A-A13C-6E1BA5A2C5A9}.OEM Release No NetMon and AirPcap|x86.Build.0 = Release|Win32
-		{8E92D840-6A36-452A-A13C-6E1BA5A2C5A9}.Release No NetMon and AirPcap(WinPcap Mode)|x64.ActiveCfg = Release|x64
-		{8E92D840-6A36-452A-A13C-6E1BA5A2C5A9}.Release No NetMon and AirPcap(WinPcap Mode)|x64.Build.0 = Release|x64
-		{8E92D840-6A36-452A-A13C-6E1BA5A2C5A9}.Release No NetMon and AirPcap(WinPcap Mode)|x86.ActiveCfg = Release|Win32
-		{8E92D840-6A36-452A-A13C-6E1BA5A2C5A9}.Release No NetMon and AirPcap(WinPcap Mode)|x86.Build.0 = Release|Win32
-		{8E92D840-6A36-452A-A13C-6E1BA5A2C5A9}.Release No NetMon and AirPcap|x64.ActiveCfg = Release|x64
-		{8E92D840-6A36-452A-A13C-6E1BA5A2C5A9}.Release No NetMon and AirPcap|x64.Build.0 = Release|x64
-		{8E92D840-6A36-452A-A13C-6E1BA5A2C5A9}.Release No NetMon and AirPcap|x86.ActiveCfg = Release|Win32
-		{8E92D840-6A36-452A-A13C-6E1BA5A2C5A9}.Release No NetMon and AirPcap|x86.Build.0 = Release|Win32
-		{8E92D840-6A36-452A-A13C-6E1BA5A2C5A9}.Release|x64.ActiveCfg = Release|x64
-		{8E92D840-6A36-452A-A13C-6E1BA5A2C5A9}.Release|x64.Build.0 = Release|x64
-		{8E92D840-6A36-452A-A13C-6E1BA5A2C5A9}.Release|x86.ActiveCfg = Release|Win32
-		{8E92D840-6A36-452A-A13C-6E1BA5A2C5A9}.Release|x86.Build.0 = Release|Win32
 		{17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52}.Debug No NetMon and AirPcap(WinPcap Mode)|x64.ActiveCfg = Debug No NetMon and AirPcap(WinPcap Mode)|x64
 		{17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52}.Debug No NetMon and AirPcap(WinPcap Mode)|x64.Build.0 = Debug No NetMon and AirPcap(WinPcap Mode)|x64
 		{17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52}.Debug No NetMon and AirPcap(WinPcap Mode)|x86.ActiveCfg = Debug No NetMon and AirPcap(WinPcap Mode)|Win32

wpcap/wpcap-cmake.bat

@@ -0,0 +1,13 @@
+set CMAKE="C:\Program Files\CMake\bin\cmake.exe"
+set GENERATOR=Visual Studio 14 2015
+set NPCAP_SDK=..\..\npcap-sdk-1.0\
+
+mkdir build-win32
+cd build-win32
+%CMAKE% -DPACKET_DLL_DIR=..\%NPCAP_SDK% -DLIBRARY_NAME=wpcap -G "%GENERATOR%" ..\libpcap\
+cd ..
+
+mkdir build-x64
+cd build-x64
+%CMAKE% -DPACKET_DLL_DIR=..\%NPCAP_SDK% -DLIBRARY_NAME=wpcap -G "%GENERATOR% Win64" ..\libpcap\
+cd ..