From 5d5dcd8492f8b2863a2de0f5bad223df27749c09 Mon Sep 17 00:00:00 2001
From: Andre Muezerie <andremue@linux.microsoft.com>
Date: Mon, 11 Nov 2024 08:14:08 -0800
Subject: [PATCH] doc: modernize build instructions on Windows

Meson 0.57 was an unstable version and is now outdated.
The referenced bug in Meson 0.58 is fixed in stable releases.
Recommend the first version containing the fix: 1.5.2.

Building DPDK applications that run on 32-bit Windows is
currently not supported. However, some Visual Studio environments
default to producing 32-bit binaries.
Recommend instructing the developer prompt to produce 64-bit binaries
when that is the case.

Signed-off-by: Andre Muezerie <andremue@linux.microsoft.com>
Acked-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
---
 .mailmap                              |  1 +
 doc/guides/windows_gsg/build_dpdk.rst | 20 +++++++++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/.mailmap b/.mailmap
index e188efa43cd..bed83b8be29 100644
--- a/.mailmap
+++ b/.mailmap
@@ -98,6 +98,7 @@ Anatolii Gerasymenko <anatolii.gerasymenko@intel.com>
 Anatoly Burakov <anatoly.burakov@intel.com>
 Anbarasan Murugesan <anbarasanx.murugesan@intel.com>
 Anders Roxell <anders.roxell@linaro.org>
+Andre Muezerie <andremue@linux.microsoft.com> <andremue@microsoft.com>
 Andrea Arcangeli <aarcange@redhat.com>
 Andrea Grandi <andrea.grandi@intel.com>
 Andre Richter <andre.o.richter@gmail.com>
diff --git a/doc/guides/windows_gsg/build_dpdk.rst b/doc/guides/windows_gsg/build_dpdk.rst
index 708875c16f8..48241f7091a 100644
--- a/doc/guides/windows_gsg/build_dpdk.rst
+++ b/doc/guides/windows_gsg/build_dpdk.rst
@@ -72,10 +72,7 @@ A good option to choose is the MSI installer for both meson and ninja together::
 
 	http://mesonbuild.com/Getting-meson.html#installing-meson-and-ninja-with-the-msi-installer%22
 
-Required version is Meson 0.57.
-
-Versions starting from 0.58 are unusable with LLVM toolchain
-because of a `Meson issue <https://github.com/mesonbuild/meson/issues/8981>`_.
+The minimal Meson supported version is 1.5.2.
 
 
 Install the Backend
@@ -129,11 +126,24 @@ Depending on the distribution, paths in this file may need adjustments.
 Option 3. Native Build on Windows using MSVC
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Open a 'Developer PowerShell for VS 2022' prompt from the start menu.
+Open a 'Visual Studio Developer Command Prompt'.
 The developer prompt will configure the environment
 to select the appropriate compiler, linker and SDK paths
 required to build with Visual Studio 2022.
 
+Building DPDK applications that run on 32-bit Windows is currently not supported.
+If your Visual Studio environment defaults to producing 32-bit binaries,
+you can instruct the toolset to produce 64-bit binaries using "-arch" parameter.
+For more details about the Developer Prompt options, look at the
+`Visual Studio Developer Command Prompt and Developer PowerShell
+<https://learn.microsoft.com/en-us/visualstudio/ide/reference/command-prompt-powershell?view=vs-2022>`_.
+
+.. code-block:: console
+
+    "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=amd64
+
+Compile the code from the developer prompt.
+
 .. code-block:: console
 
    cd C:\Users\me\dpdk