From d686a44b4f08a4335dfb4ba94e1dd14c18fb176c Mon Sep 17 00:00:00 2001 From: Xaviou Date: Sun, 3 Apr 2022 10:45:07 +0200 Subject: [PATCH 1/2] Update MinGW build tools (MinGW-1030-TDM and MSYS2 MinGW-1120) --- build/tools/mingw/buildall.bat | 2 +- build/tools/mingw/parameters.bat | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/tools/mingw/buildall.bat b/build/tools/mingw/buildall.bat index c8c0c0396d..330515ec5a 100644 --- a/build/tools/mingw/buildall.bat +++ b/build/tools/mingw/buildall.bat @@ -11,7 +11,7 @@ rem Initialize the main log file with the current date and time echo %date% %time% : wxWidgets-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER% build started > %MAINLOGFILE% rem Loop through all versions of the compiler -for %%c in ( 730 810 1020 920 ) do ( +for %%c in ( 730 810 1030 1120 ) do ( rem For each version, create a 32 and a 64 bits build for %%a in ( 32 64 ) do ( call officialbuild.bat %%c %%a diff --git a/build/tools/mingw/parameters.bat b/build/tools/mingw/parameters.bat index d6ea5d67e3..4f6b89206f 100644 --- a/build/tools/mingw/parameters.bat +++ b/build/tools/mingw/parameters.bat @@ -13,7 +13,7 @@ rem Check if architecture is present if "%2" == "" goto :NOPARAMS rem Define compiler's bin directory -if "%1" == "1020" ( +if "%1" == "1120" ( set COMPBINDIR=G:\msys64\mingw%2\bin ) else ( set COMPBINDIR=G:\MinGW%1-%2\bin @@ -22,7 +22,7 @@ rem Define compiler's version string such as 810, 730_x64, 920TDM rem Also define extra spaces for "aligned" logs lines set COMPVERS=%1 set XTRASPCS= : -if "%1" == "920" ( +if "%1" == "1030" ( set COMPVERS=%COMPVERS%TDM ) else ( set XTRASPCS= %XTRASPCS% @@ -32,7 +32,7 @@ if "%2" == "64" ( ) else ( set XTRASPCS= %XTRASPCS% ) -rem Define compiler's name, such as gcc810, gcc730_x64, gcc920TDM, ... +rem Define compiler's name, such as gcc810, gcc730_x64, gcc1030TDM, ... set COMPNAME=gcc%COMPVERS% rem Simplified (but sufficient) PATH variable set PATH=C:\Windows;C:\Windows\system32\;%COMPBINDIR% From d923feee31856a2ec680ddbf1a31222aebe787b2 Mon Sep 17 00:00:00 2001 From: Xaviou Date: Sun, 3 Apr 2022 10:56:18 +0200 Subject: [PATCH 2/2] Readme Update --- build/tools/mingw/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/tools/mingw/README.md b/build/tools/mingw/README.md index ab222a5e37..41f2f202dd 100644 --- a/build/tools/mingw/README.md +++ b/build/tools/mingw/README.md @@ -25,5 +25,5 @@ The following versions of MinGW are actually used to create binaries (they all u * MinGW-W64 GCC-7.3.0 using SJLJ exceptions for 32 bits architecture downloadable from [here](https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/7.3.0/threads-win32/sjlj/i686-7.3.0-release-win32-sjlj-rt_v5-rev0.7z "MinGW-W64 GCC-7.3.0 i686 Win32 SJLJ") and SEH exceptions for 64 bits architecture downloadable from [here](https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/7.3.0/threads-win32/seh/x86_64-7.3.0-release-win32-seh-rt_v5-rev0.7z "MinGW-W64 GCC-7.3.0 x86_64 Win32 SEH") * MinGW-W64 GCC-8.1.0 using SJLJ exceptions for 32 bits architecture downloadable from [here](https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/8.1.0/threads-win32/sjlj/i686-8.1.0-release-win32-sjlj-rt_v6-rev0.7z "MinGW-W64 GCC-8.1.0 i686 Win32 SJLJ") and SEH exceptions for 64 bits architecture downloadable from [here](https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/8.1.0/threads-win32/seh/x86_64-8.1.0-release-win32-seh-rt_v6-rev0.7z "MinGW-W64 GCC-8.1.0 x86_64 Win32 SEH") - * MinGW-TDM GCC-9.2.0 downloadable from [here](https://jmeubank.github.io/tdm-gcc/articles/2020-03/9.2.0-release "TDM GCC-9.2.0") - * MSYS2 MinGW GCC-10.2.0 which is the last version installable using [MSYS2](https://www.msys2.org "www.msys2.org") package manager + * MinGW-TDM GCC-10.3.0 downloadable from [here](https://jmeubank.github.io/tdm-gcc/articles/2021-05/10.3.0-release"TDM GCC-10.3.0") + * MSYS2 MinGW GCC-11.2.0 which is the last version installable using [MSYS2](https://www.msys2.org "www.msys2.org") package manager