Skip to content

Commit 882dd72

Browse files
guyharrisfxlb
authored andcommitted
Merge Readme.Win32 into doc/README.Win32.md. [skip ci]
We should only have one "how to build on Windows" file. (cherry picked from commit c7e9212)
1 parent 16897f4 commit 882dd72

File tree

3 files changed

+21
-53
lines changed

3 files changed

+21
-53
lines changed

Makefile.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,6 @@ EXTRA_DIST = \
337337
Makefile.in \
338338
Makefile-devel-adds \
339339
README.md \
340-
Readme.Win32 \
341340
VERSION \
342341
aclocal.m4 \
343342
atime.awk \

Readme.Win32

Lines changed: 0 additions & 46 deletions
This file was deleted.

doc/README.Win32.md

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -172,14 +172,29 @@ of the tcpdump source directory.
172172

173173
Run the command
174174

175-
cmake "-DPacket_ROOT={path-to-sdk}" {path-to-tcpdump-source}
175+
cmake "-DPacket_ROOT={path-to-sdk}" -G {generator} {path-to-tcpdump-source}
176176

177-
where {path-to-sdk} is the path of the directory containing the Npcap or
178-
WinPcap SDK and {path-to-tcpdump-source} is the pathname of the
179-
top-level source directory for tcpdump.
177+
{path-to-sdk} is the path of the directory containing the Npcap or
178+
WinPcap SDK.
179+
180+
{generator} is the string "Visual Studio N YYYY", where "N" is the
181+
version of Visual Studio and "YYYY" is the year number for that version;
182+
if you are building a 64-bit version of tcpdump, YYYY must be followed
183+
by a space and "Win64". For example, to build a 32-bit version of
184+
tcpdump with Visual Studio 2017, "{generator}" would be "Visual Studio
185+
15 2017" and to build a 64-bit version of tcpdump with Visual Studio
186+
2017, "{generator}" would be "Visual Studio 15 2017 Win64".
187+
188+
{path-to-tcpdump-source} is the pathname of the top-level source
189+
directory for tcpdump.
180190

181191
Run the command
182192

183-
msbuild /m tcpdump.sln
193+
msbuild /m /nologo /p:Configuration={configuration} tcpdump.sln
194+
195+
where {configuration} can be "Release", "Debug", or "RelWithDebInfo".
196+
197+
Building with MinGW
198+
-------------------
184199

185-
to compile tcpdump.
200+
(XXX - this should be added)

0 commit comments

Comments
 (0)