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 c7e9212a017ba0bea0abfd7d4b471c0082de8864)

diff --git a/Makefile.in b/Makefile.in
index 01952c88c057fc33fb7917ac168d4189c9cec193..4ffca817b328357d79d1f992dca700f14c7505a2 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -337,7 +337,6 @@ EXTRA_DIST = \
        Makefile.in \
        Makefile-devel-adds \
        README.md \
-       Readme.Win32 \
        VERSION \
        aclocal.m4 \
        atime.awk \

diff --git a/Readme.Win32 b/Readme.Win32
deleted file mode 100644 (file)
index 4c07992..0000000
--- a/Readme.Win32
+++ /dev/null
@@ -1,46 +0,0 @@
-To build tcpdump under Windows, you need:
-
-- Microsoft Visual Studio 2015 or later
-- the WinPcap or Npcap SDK, which includes libpcap for win32. The
-  WinPcap SDK can be doneloaded from
-
-    https://www.winpcap.org/devel.htm
-
-  and the Npcap SDK can be downloaded from
-
-    https://nmap.org/npcap/
-- CMake, which can be downloadd from
-
-    https://cmake.org
-
-First, make a build directory, either as a subdirectory of the tcpdump
-source directory or as a separate directory.
-
-Second, change to the build directory, and run CMake with the following
-arguments:
-
-  -DCMAKE_PREFIX_PATH={pathname of the WinPcap/Npcap SDK}
-
-  -G {generator}
-
-  the pathname of the tcpdump source directory relative to the build
-  directory (".." if the build directory is a subdirectory of the
-  tcpdump source directory).
-
-"{generator}" would be the string "Visual Studio N YYYY", where "N" is
-the version of Visual Studio and "YYYY" is the year number for that
-version; if you are building a 64-bit version of tcpdump, YYYY must be
-followed by a space and "Win64".  For example, to build a 32-bit version
-of tcpdump with Visual Studio 2015, "{generator}" would be "Visual
-Studio 14 2015" and to build a 64-bit version of tcpdump with Visual
-Studio 2017, "{generator}" would be "Visual Studio 15 2017 Win64".
-
-Third, from the build directory, run the command
-
-  msbuild /m /nologo /p:Configuration={configuration} tcpdump.sln
-
-where {configuration} can be "Release", "Debug", or "RelWithDebInfo", or
-build tcpdump from the Visual Studio application using the solution file
-in question.
-
-(XXX - rules for building with MinGW should be added.)

diff --git a/doc/README.Win32.md b/doc/README.Win32.md
index f861198772bc6647828cfdb30ac7b8474810a1b1..f500aecab7041a766dd729067b44e0ce647bc34a 100644 (file)
--- a/doc/README.Win32.md
+++ b/doc/README.Win32.md
@@ -172,14 +172,29 @@ of the tcpdump source directory.
 
 Run the command
 
-       cmake "-DPacket_ROOT={path-to-sdk}" {path-to-tcpdump-source}
+    cmake "-DPacket_ROOT={path-to-sdk}" -G {generator} {path-to-tcpdump-source}
 
-where {path-to-sdk} is the path of the directory containing the Npcap or
-WinPcap SDK and {path-to-tcpdump-source} is the pathname of the
-top-level source directory for tcpdump.
+{path-to-sdk} is the path of the directory containing the Npcap or
+WinPcap SDK.
+
+{generator} is the string "Visual Studio N YYYY", where "N" is the
+version of Visual Studio and "YYYY" is the year number for that version;
+if you are building a 64-bit version of tcpdump, YYYY must be followed
+by a space and "Win64".  For example, to build a 32-bit version of
+tcpdump with Visual Studio 2017, "{generator}" would be "Visual Studio
+15 2017" and to build a 64-bit version of tcpdump with Visual Studio
+2017, "{generator}" would be "Visual Studio 15 2017 Win64".
+
+{path-to-tcpdump-source} is the pathname of the top-level source
+directory for tcpdump.
 
 Run the command
 
-       msbuild /m tcpdump.sln
+    msbuild /m /nologo /p:Configuration={configuration} tcpdump.sln
+
+where {configuration} can be "Release", "Debug", or "RelWithDebInfo".
+
+Building with MinGW
+-------------------
 
-to compile tcpdump.
+(XXX - this should be added)