From 6b7df14251c49331ae7efd4811ec21f4415ccdb5 Mon Sep 17 00:00:00 2001
From: Luca Barbato <lu_zero@gentoo.org>
Date: Mon, 23 Nov 2015 13:05:09 +0100
Subject: doc: Document better how to use MSYS2

---
 doc/platform.texi | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

(limited to 'doc')

diff --git a/doc/platform.texi b/doc/platform.texi
index 07c857532f..09a38ff9e3 100644
--- a/doc/platform.texi
+++ b/doc/platform.texi
@@ -101,20 +101,43 @@ Notes:
 
 @itemize
 
-@item Building natively using MSYS2 can be sped up by disabling implicit rules
-in the Makefile by calling @code{make -r} instead of plain @code{make}. This
+@item Native MSYS building is discouraged, MSYS2 provides a full mingw-w64
+environment through @file{mingw64_shell.bat} or @file{mingw32_shell.bat}
+that should be used instead of the environment provides by
+@file{msys2_shell.bat}.
+
+@item Building using MSYS2 can be sped up by disabling implicit rules in the
+Makefile by calling @code{make -r} instead of plain @code{make}. This
 speed up is close to non-existent for normal one-off builds and is only
 noticeable when running make for a second time (for example during
 @code{make install}).
 
-@item In order to compile AVplay, you must have the MinGW development library
-of @uref{http://www.libsdl.org/, SDL} and @code{pkg-config} installed.
+@item In order to compile @command{avplay}, you must have the MinGW development
+library of @uref{http://www.libsdl.org/, SDL} and @code{pkg-config} installed.
 
 @item By using @code{./configure --enable-shared} when configuring Libav,
 you can build all libraries as DLLs.
 
 @end itemize
 
+@subsection Native Windows compilation using MSYS2
+
+The MSYS2 MinGW-w64 environment provides ready to use toolchains and dependencies
+through @command{pacman}.
+
+Make sure to use @file{mingw64_shell.bat} or @file{mingw32_shell.bat} to have
+the correct MinGW-w64 environment.
+
+@example
+# normal msys2 packages
+pacman -S make pkgconf diffutils
+
+# mingw-w64 packages and toolchains
+pacman -S mingw-w64-x86_64-yasm mingw-w64-x86_64-gcc mingw-w64-x86_64-SDL
+@end example
+
+To target 32bit replace the @code{x86_64} with @code{i686} in the command above.
+
 @section Microsoft Visual C++ or Intel C++ Compiler for Windows
 
 Libav can be built with MSVC 2012 or earlier using a C99-to-C89 conversion utility
-- 
cgit v1.2.3