New solution configs for ARM64 and Win8/8.1 driver

EL-IT · May 13, 2021 · d36cc6e · d36cc6e
1 parent 3b6721f
commit d36cc6e
Show file tree

Hide file tree

Showing 12 changed files with 2,348 additions and 10 deletions.
diff --git a/create_lib.bat b/create_lib.bat
@@ -18,11 +18,13 @@ echo Creating \Lib folder
 mkdir %WPDPACKDESTDIR% 		>nul 2>nul
 mkdir %WPDPACKDESTDIR%\Lib 	>nul 2>nul
 mkdir %WPDPACKDESTDIR%\Lib\x64	>nul 2>nul
+mkdir %WPDPACKDESTDIR%\Lib\ARM64	>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\packet.lib" %WPDPACKDESTDIR%\Lib\ || goto :fail
 xcopy /v /Y "%PACKETBUILDDIR%\x64\Release\packet.lib" %WPDPACKDESTDIR%\Lib\x64 || goto :fail
+xcopy /v /Y "%PACKETBUILDDIR%\ARM64\Release No AirPcap\packet.lib" %WPDPACKDESTDIR%\Lib\ARM64 || goto :fail
 
 echo Folder \Lib created successfully
 

diff --git a/installer/Build.bat b/installer/Build.bat
@@ -6,14 +6,22 @@ rem SET MODE="Debug"
 for /f "usebackq delims=#" %%a in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere" -version 16 -property installationPath`) do call "%%a\VC\Auxiliary\Build\vcvarsall.bat" x86
 
 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% Win8 driver" /p:Platform="x86"
 msbuild "%NPCAPDIR%\packetWin7\vs14\npcap.sln" /m /t:Build /p:Configuration="%MODE% Win10 driver" /p:Platform="x86"
 msbuild "%NPCAPDIR%\wpcap\build-win32\wpcap.vcxproj" /m /t:Build /p:Configuration="%MODE%" /p:Platform="Win32"
 
 for /f "usebackq delims=#" %%a in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere" -version 16 -property installationPath`) do call "%%a\VC\Auxiliary\Build\vcvarsall.bat" x64
 
 msbuild "%NPCAPDIR%\packetWin7\vs14\npcap.sln" /m /t:Build /p:Configuration="%MODE%" /p:Platform="x64"
+msbuild "%NPCAPDIR%\packetWin7\vs14\npcap.sln" /m /t:Build /p:Configuration="%MODE% Win8 driver" /p:Platform="x64"
 msbuild "%NPCAPDIR%\packetWin7\vs14\npcap.sln" /m /t:Build /p:Configuration="%MODE% Win10 driver" /p:Platform="x64"
 msbuild "%NPCAPDIR%\wpcap\build-x64\wpcap.vcxproj" /m /t:Build /p:Configuration="%MODE%" /p:Platform="x64"
 
+for /f "usebackq delims=#" %%a in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere" -version 16 -property installationPath`) do call "%%a\VC\Auxiliary\Build\vcvarsall.bat" ARM64
+
+msbuild "%NPCAPDIR%\packetWin7\vs14\npcap.sln" /m /t:Build /p:Configuration="%MODE%" /p:Platform="ARM64"
+msbuild "%NPCAPDIR%\packetWin7\vs14\npcap.sln" /m /t:Build /p:Configuration="%MODE% Win10 driver" /p:Platform="ARM64"
+rem msbuild "%NPCAPDIR%\wpcap\build-ARM64\wpcap.vcxproj" /m /t:Build /p:Configuration="%MODE%" /p:Platform="ARM64"
+
 pause
 
diff --git a/packetWin7/Dll/Project/Packet.vcxproj b/packetWin7/Dll/Project/Packet.vcxproj
diff --git a/packetWin7/Helper/NpcapHelper/NpcapHelper.vcxproj b/packetWin7/Helper/NpcapHelper/NpcapHelper.vcxproj
diff --git a/packetWin7/NPFInstall/NPFInstall/NPFInstall.vcxproj b/packetWin7/NPFInstall/NPFInstall/NPFInstall.vcxproj
diff --git a/packetWin7/WlanHelper/WlanHelper/WlanHelper.vcxproj b/packetWin7/WlanHelper/WlanHelper/WlanHelper.vcxproj
diff --git a/packetWin7/npf/npf Package/npf Package.vcxproj b/packetWin7/npf/npf Package/npf Package.vcxproj
diff --git a/packetWin7/npf/npf/npcap.inf b/packetWin7/npf/npf/npcap.inf
@@ -13,13 +13,13 @@ DriverVer=05/15/2015,14.48.38.905
 
 
 [Manufacturer]
-%Insecure%=Insecure,NTx86,NTia64,NTamd64
+%Insecure%=Insecure,NTx86,NTARM64,NTamd64
 
 [Insecure.NTx86]
 %NPF_Desc_Standard%=FilterStandard, INSECURE_NPCAP
 %NPF_Desc_WiFi%=FilterWiFi, INSECURE_NPCAP_WIFI
 
-[Insecure.NTia64]
+[Insecure.NTARM64]
 %NPF_Desc_Standard%=FilterStandard, INSECURE_NPCAP
 %NPF_Desc_WiFi%=FilterWiFi, INSECURE_NPCAP_WIFI
 

diff --git a/packetWin7/npf/npf/npcap_wfp.inf b/packetWin7/npf/npf/npcap_wfp.inf
@@ -13,12 +13,12 @@ DriverVer=05/15/2015,14.48.38.905
 
 
 [Manufacturer]
-%Insecure%=Insecure,NTx86,NTia64,NTamd64
+%Insecure%=Insecure,NTx86,NTARM64,NTamd64
 
 [Insecure.NTx86]
 %NPF_Desc%=Install, INSECURE_NPCAP
 
-[Insecure.NTia64]
+[Insecure.NTARM64]
 %NPF_Desc%=Install, INSECURE_NPCAP
 
 [Insecure.NTamd64]

diff --git a/packetWin7/npf/npf/npf.vcxproj b/packetWin7/npf/npf/npf.vcxproj
diff --git a/packetWin7/vs14/npcap.sln b/packetWin7/vs14/npcap.sln
diff --git a/wpcap/wpcap-cmake.bat b/wpcap/wpcap-cmake.bat
@@ -1,6 +1,6 @@
 set CMAKE="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe"
 set GENERATOR=Visual Studio 16 2019
-set NPCAP_SDK=..\..\npcap-sdk-1.06
+set NPCAP_SDK=..\npcap-sdk
 set AIRPCAP_SDK=..\..\Airpcap_Devpack
 
 mkdir build-win32
@@ -12,3 +12,9 @@ mkdir build-x64
 cd build-x64
 %CMAKE% -A x64 -DPacket_ROOT=..\%NPCAP_SDK% -DLIBRARY_NAME=wpcap -DAirPcap_ROOT=..\%AIRPCAP_SDK% -G "%GENERATOR%" ..\libpcap\
 cd ..
+
+rem AirPcap does not have ARM64 libs
+mkdir build-ARM64
+cd build-ARM64
+%CMAKE% -A ARM64 -DPacket_ROOT=..\%NPCAP_SDK% -DLIBRARY_NAME=wpcap -G "%GENERATOR%" ..\libpcap\
+cd ..