From 7b0305f81e086d8d4388c61ae39a968cf91ec8a0 Mon Sep 17 00:00:00 2001 From: "Bryan W. Weber" Date: Fri, 6 Jan 2017 11:49:20 -0500 Subject: [PATCH] [Doc] Mention TDM-GCC and discourage regular MinGW --- doc/sphinx/compiling/dependencies.rst | 1 + doc/sphinx/compiling/installation-reqs.rst | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/doc/sphinx/compiling/dependencies.rst b/doc/sphinx/compiling/dependencies.rst index 1c7e92dac..85afe91c2 100644 --- a/doc/sphinx/compiling/dependencies.rst +++ b/doc/sphinx/compiling/dependencies.rst @@ -35,6 +35,7 @@ Fortran compiler is required only if you plan to build the Fortran module. * MinGW (C/C++/Fortran) * http://mingw-w64.sourceforge.net/ (64-bit and 32-bit) + * http://tdm-gcc.tdragon.net/ (64-bit and 32-bit) * Known to work with Mingw-w64 3.0, which provides GCC 4.8. Expected to work with any version that provides a supported version of GCC and includes C++11 thread support. diff --git a/doc/sphinx/compiling/installation-reqs.rst b/doc/sphinx/compiling/installation-reqs.rst index c73131a30..617ca68c4 100644 --- a/doc/sphinx/compiling/installation-reqs.rst +++ b/doc/sphinx/compiling/installation-reqs.rst @@ -225,14 +225,14 @@ Windows Requirements * http://mingw-w64.org/ + * http://tdm-gcc.tdragon.net/ + * Known to work with Mingw-w64 3.0, which provides GCC 4.8. Expected to work with any version that provides a supported version of GCC and includes C++11 thread support. - * The version of MinGW from http://www.mingw.org/ is 32-bit only and - therefore cannot be used to build a 64-bit module. Versions of - MinGW that provide a 64-bit compiler are available from - http://mingw-w64.org/ + * The version of MinGW from http://www.mingw.org/ cannot be used to build + Cantera. Users must use MinGW-w64 or TDM-GCC. * The Boost headers