summaryrefslogtreecommitdiff
path: root/win32/msvcbuild.bat
diff options
context:
space:
mode:
Diffstat (limited to 'win32/msvcbuild.bat')
-rw-r--r--win32/msvcbuild.bat25
1 files changed, 11 insertions, 14 deletions
diff --git a/win32/msvcbuild.bat b/win32/msvcbuild.bat
index 3a1e0da..ca4c513 100644
--- a/win32/msvcbuild.bat
+++ b/win32/msvcbuild.bat
@@ -2,10 +2,7 @@
@rem Script to build libnet with MSVC.
@rem Dependencies are:
-@rem winpcap, specifically, the winpcap developer pack
-@rem We assume WpdPack\ and libnet-master\ to have the same path,
-@rem and that this script is executed from either a VS2015 Developer Command Prompt
-@rem or an elevated Command Prompt.
+@rem Npcap SDK in ..\npcap-sdk
@rem
@rem Helpful links for non-Windows users:
@rem https://github.com/microsoft/vswhere/wiki/Find-VC#batch
@@ -48,7 +45,7 @@ goto msvcbuild64
@set VERSION=1.2
@rem relative to C code in src/
-@set WINPCAP=..\..\WpdPack
+@set NPCAP=..\..\npcap-sdk
if not exist "src\win32\" mkdir "src\win32\"
@@ -60,8 +57,8 @@ copy win32\config.h include\
copy win32\getopt.h include\
cd src
-%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
-%MYLINK% /DLL /libpath:%WINPCAP%\Lib /out:..\lib\x86\libnet%VERSION%.dll win32\*.obj Advapi32.lib
+%MYCOMPILE% /I..\include /I%NPCAP%\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
+%MYLINK% /DLL /libpath:%NPCAP%\Lib /out:..\lib\x86\libnet%VERSION%.dll win32\*.obj Advapi32.lib
if exist libnet.dll.manifest^
%MYMT% -manifest libnet.dll.manifest -outputresource:libnet.dll;2
cd ..
@@ -77,7 +74,7 @@ exit /b %errorlevel%
@set VERSION=1.2
@rem relative to C code in src/
-@set WINPCAP=..\..\WpdPack
+@set NPCAP=..\..\npcap-sdk
if not exist "src\win64\" mkdir "src\win64\"
@@ -90,14 +87,14 @@ copy win32\getopt.h include\
cd src
dir ..\..\..\
-dir ..\..\..\WpdPack
+dir ..\..\..\npcap-sdk
dir ..\..\
-dir ..\..\WpdPack
-dir ..\..\WpdPack\Include
+dir ..\..\npcap-sdk
+dir ..\..\npcap-sdk\Include
@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
-%MYLINK% /DLL /libpath:%WINPCAP%\Lib\x64 /out:..\lib\x64\libnet%VERSION%.dll win64\*.obj Advapi32.lib
+dir "%NPCAP%\Include\"
+%MYCOMPILE% /I..\include /I%NPCAP%\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
+%MYLINK% /DLL /libpath:%NPCAP%\Lib\x64 /out:..\lib\x64\libnet%VERSION%.dll win64\*.obj Advapi32.lib
if exist libnet.dll.manifest^
%MYMT% -manifest libnet.dll.manifest -outputresource:libnet.dll;2
cd ..