Skip to content

Commit

Permalink
Build AirPcap support by default (experimental and untested)
Browse files Browse the repository at this point in the history
  • Loading branch information
@bonsaiviking
bonsaiviking committed Apr 3, 2020
1 parent 9b70387 commit 6324ffb
Show file tree
Hide file tree
Showing 5 changed files with 330 additions and 348 deletions.
4 changes: 2 additions & 2 deletions create_lib.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ mkdir %WPDPACKDESTDIR%\Lib\x64 >nul 2>nul

xcopy /v /Y "%WPCAPBUILDDIR32%\Release\wpcap.lib" %WPDPACKDESTDIR%\Lib\ || goto :fail
xcopy /v /Y "%WPCAPBUILDDIR64%\Release\wpcap.lib" %WPDPACKDESTDIR%\Lib\x64 || goto :fail
xcopy /v /Y "%PACKETBUILDDIR%\Release No NetMon and AirPcap\packet.lib" %WPDPACKDESTDIR%\Lib\ || goto :fail
xcopy /v /Y "%PACKETBUILDDIR%\x64\Release No NetMon and AirPcap\packet.lib" %WPDPACKDESTDIR%\Lib\x64 || goto :fail
xcopy /v /Y "%PACKETBUILDDIR%\Release\packet.lib" %WPDPACKDESTDIR%\Lib\ || goto :fail
xcopy /v /Y "%PACKETBUILDDIR%\x64\Release\packet.lib" %WPDPACKDESTDIR%\Lib\x64 || goto :fail

echo Folder \Lib created successfully

Expand Down
4 changes: 2 additions & 2 deletions installer/Build.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ rem SET MODE="Debug"
::::::::::
call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat"

msbuild "%NPCAPDIR%\packetWin7\vs14\npcap.sln" /m /t:Build /p:Configuration="%MODE% No NetMon and AirPcap" /p:Platform="x86"
msbuild "%NPCAPDIR%\packetWin7\vs14\npcap.sln" /m /t:Build /p:Configuration="%MODE% No NetMon and AirPcap" /p:Platform="x64"
msbuild "%NPCAPDIR%\packetWin7\vs14\npcap.sln" /m /t:Build /p:Configuration="%MODE%" /p:Platform="x86"
msbuild "%NPCAPDIR%\packetWin7\vs14\npcap.sln" /m /t:Build /p:Configuration="%MODE%" /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"
Expand Down
54 changes: 18 additions & 36 deletions packetWin7/Dll/Project/Packet.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,58 +7,40 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Packet", "Packet.vcxproj",
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug No NetMon and AirPcap|Win32 = Debug No NetMon and AirPcap|Win32
Debug No NetMon and AirPcap|x64 = Debug No NetMon and AirPcap|x64
Debug No NetMon|Win32 = Debug No NetMon|Win32
Debug No NetMon|x64 = Debug No NetMon|x64
Debug No AirPcap|Win32 = Debug No AirPcap|Win32
Debug No AirPcap|x64 = Debug No AirPcap|x64
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
OEM Release No NetMon and AirPcap|Win32 = OEM Release No NetMon and AirPcap|Win32
OEM Release No NetMon and AirPcap|x64 = OEM Release No NetMon and AirPcap|x64
OEM Release No AirPcap|Win32 = OEM Release No AirPcap|Win32
OEM Release No AirPcap|x64 = OEM Release No AirPcap|x64
Release LOG_TO_FILE|Win32 = Release LOG_TO_FILE|Win32
Release LOG_TO_FILE|x64 = Release LOG_TO_FILE|x64
Release No NetMon and AirPcap|Win32 = Release No NetMon and AirPcap|Win32
Release No NetMon and AirPcap|x64 = Release No NetMon and AirPcap|x64
Release No NetMon LOG_TO_FILE|Win32 = Release No NetMon LOG_TO_FILE|Win32
Release No NetMon LOG_TO_FILE|x64 = Release No NetMon LOG_TO_FILE|x64
Release No NetMon|Win32 = Release No NetMon|Win32
Release No NetMon|x64 = Release No NetMon|x64
Release No AirPcap|Win32 = Release No AirPcap|Win32
Release No AirPcap|x64 = Release No AirPcap|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52}.Debug No NetMon and AirPcap|Win32.ActiveCfg = Debug No NetMon and AirPcap|Win32
{17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52}.Debug No NetMon and AirPcap|Win32.Build.0 = Debug No NetMon and AirPcap|Win32
{17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52}.Debug No NetMon and AirPcap|x64.ActiveCfg = Debug No NetMon and AirPcap|x64
{17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52}.Debug No NetMon and AirPcap|x64.Build.0 = Debug No NetMon and AirPcap|x64
{17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52}.Debug No NetMon|Win32.ActiveCfg = Debug No NetMon|Win32
{17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52}.Debug No NetMon|Win32.Build.0 = Debug No NetMon|Win32
{17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52}.Debug No NetMon|x64.ActiveCfg = Debug No NetMon|x64
{17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52}.Debug No NetMon|x64.Build.0 = Debug No NetMon|x64
{17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52}.Debug No AirPcap|Win32.ActiveCfg = Debug No AirPcap|Win32
{17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52}.Debug No AirPcap|Win32.Build.0 = Debug No AirPcap|Win32
{17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52}.Debug No AirPcap|x64.ActiveCfg = Debug No AirPcap|x64
{17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52}.Debug No AirPcap|x64.Build.0 = Debug No AirPcap|x64
{17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52}.Debug|Win32.ActiveCfg = Debug|Win32
{17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52}.Debug|Win32.Build.0 = Debug|Win32
{17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52}.Debug|x64.ActiveCfg = Debug|x64
{17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52}.Debug|x64.Build.0 = Debug|x64
{17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52}.OEM Release No NetMon and AirPcap|Win32.ActiveCfg = OEM Release No NetMon and AirPcap|Win32
{17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52}.OEM Release No NetMon and AirPcap|Win32.Build.0 = OEM Release No NetMon and AirPcap|Win32
{17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52}.OEM Release No NetMon and AirPcap|x64.ActiveCfg = OEM Release No NetMon and AirPcap|x64
{17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52}.OEM Release No NetMon and AirPcap|x64.Build.0 = OEM Release No NetMon and AirPcap|x64
{17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52}.OEM Release No AirPcap|Win32.ActiveCfg = OEM Release No AirPcap|Win32
{17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52}.OEM Release No AirPcap|Win32.Build.0 = OEM Release No AirPcap|Win32
{17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52}.OEM Release No AirPcap|x64.ActiveCfg = OEM Release No AirPcap|x64
{17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52}.OEM Release No AirPcap|x64.Build.0 = OEM Release No AirPcap|x64
{17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52}.Release LOG_TO_FILE|Win32.ActiveCfg = Release LOG_TO_FILE|Win32
{17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52}.Release LOG_TO_FILE|Win32.Build.0 = Release LOG_TO_FILE|Win32
{17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52}.Release LOG_TO_FILE|x64.ActiveCfg = Release LOG_TO_FILE|x64
{17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52}.Release LOG_TO_FILE|x64.Build.0 = Release LOG_TO_FILE|x64
{17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52}.Release No NetMon and AirPcap|Win32.ActiveCfg = Release No NetMon and AirPcap|Win32
{17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52}.Release No NetMon and AirPcap|Win32.Build.0 = Release No NetMon and AirPcap|Win32
{17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52}.Release No NetMon and AirPcap|x64.ActiveCfg = Release No NetMon and AirPcap|x64
{17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52}.Release No NetMon and AirPcap|x64.Build.0 = Release No NetMon and AirPcap|x64
{17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52}.Release No NetMon LOG_TO_FILE|Win32.ActiveCfg = Release No NetMon LOG_TO_FILE|Win32
{17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52}.Release No NetMon LOG_TO_FILE|Win32.Build.0 = Release No NetMon LOG_TO_FILE|Win32
{17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52}.Release No NetMon LOG_TO_FILE|x64.ActiveCfg = Release No NetMon LOG_TO_FILE|x64
{17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52}.Release No NetMon LOG_TO_FILE|x64.Build.0 = Release No NetMon LOG_TO_FILE|x64
{17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52}.Release No NetMon|Win32.ActiveCfg = Release No NetMon|Win32
{17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52}.Release No NetMon|Win32.Build.0 = Release No NetMon|Win32
{17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52}.Release No NetMon|x64.ActiveCfg = Release No NetMon|x64
{17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52}.Release No NetMon|x64.Build.0 = Release No NetMon|x64
{17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52}.Release No AirPcap|Win32.ActiveCfg = Release No AirPcap|Win32
{17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52}.Release No AirPcap|Win32.Build.0 = Release No AirPcap|Win32
{17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52}.Release No AirPcap|x64.ActiveCfg = Release No AirPcap|x64
{17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52}.Release No AirPcap|x64.Build.0 = Release No AirPcap|x64
{17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52}.Release|Win32.ActiveCfg = Release|Win32
{17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52}.Release|Win32.Build.0 = Release|Win32
{17D62EEB-EABF-4D94-B1FF-BCDAAFA7DA52}.Release|x64.ActiveCfg = Release|x64
Expand Down
Loading

0 comments on commit 6324ffb

Please sign in to comment.