Merge branch 'doc-mingw-makefiles' into release

This commit is contained in:
Brad King 2014-12-22 09:59:57 -05:00
commit 90f5845e72
2 changed files with 15 additions and 6 deletions

View File

@ -1,7 +1,11 @@
MSYS Makefiles MSYS Makefiles
-------------- --------------
Generates MSYS makefiles. Generates makefiles for use with MSYS ``make`` under the MSYS shell.
The makefiles use /bin/sh as the shell. They require msys to be Use this generator in a MSYS shell prompt and using ``make`` as the build
installed on the machine. tool. The generated makefiles use ``/bin/sh`` as the shell to launch build
rules. They are not compatible with a Windows command prompt.
To build under a Windows command prompt, use the
:generator:`MinGW Makefiles` generator.

View File

@ -1,7 +1,12 @@
MinGW Makefiles MinGW Makefiles
--------------- ---------------
Generates a make file for use with mingw32-make. Generates makefiles for use with ``mingw32-make`` under a Windows command
prompt.
The makefiles generated use cmd.exe as the shell. They do not require Use this generator under a Windows command prompt with MinGW in the ``PATH``
msys or a unix shell. and using ``mingw32-make`` as the build tool. The generated makefiles use
``cmd.exe`` as the shell to launch build rules. They are not compatible with
MSYS or a unix shell.
To build under the MSYS shell, use the :generator:`MSYS Makefiles` generator.