Skip to content

Commit 20c6499

Browse files
committed
Merge branch 'build-tools-3.2' of https://github.com/XPsoud/wxWidgets into 3.2
Use gcc 13.2 under MSYS2 and include the licence in all archives. See wxWidgets#24491, wxWidgets#24497.
2 parents 16eb124 + 02690fd commit 20c6499

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

build/tools/mingw/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,5 @@ The following versions of MinGW are actually used to create binaries (they all u
2626
* 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")
2727
* 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")
2828
* 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")
29-
* MSYS2 MinGW GCC-12.1.0 which is the last version installable using [MSYS2](https://www.msys2.org "www.msys2.org") package manager
29+
* MSYS2 MinGW GCC-13.2.0 which is the last version installable using [MSYS2](https://www.msys2.org "www.msys2.org") package manager
30+
* MSYS2 MinGW GCC-12.2.0 which is the previous version of the MSYS2 installation

build/tools/mingw/buildall.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ rem Initialize the main log file with the current date and time
1111
echo %date% %time% : wxWidgets-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER% build started > %MAINLOGFILE%
1212

1313
rem Loop through all versions of the compiler
14-
for %%c in ( 730 810 1030 1220 ) do (
14+
for %%c in ( 730 810 1030 1220 1320 ) do (
1515
rem For each version, create a 32 and a 64 bits build
1616
for %%a in ( 32 64 ) do (
1717
call officialbuild.bat %%c %%a

build/tools/mingw/officialbuild.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@ rem ============================================ Create archives
7676
title Archives for %COMPNAME%
7777
cd %WXDIR%\
7878
if exist %OUTPUTDIR%\%ARCHNAME%%COMPNAME%_Dev.7z del %OUTPUTDIR%\%ARCHNAME%%COMPNAME%_Dev.7z
79-
%ZIP% a -t7z -mx4 -bb %OUTPUTDIR%\%ARCHNAME%%COMPNAME%_Dev.7z -r %COMPNAME%_dll
79+
%ZIP% a -t7z -mx4 -bb %OUTPUTDIR%\%ARCHNAME%%COMPNAME%_Dev.7z -r %COMPNAME%_dll docs\licence.txt
8080
set ERRLVL=%ERRORLEVEL%
8181
if exist %OUTPUTDIR%\%ARCHNAME%%COMPNAME%_ReleaseDLL.7z del %OUTPUTDIR%\%ARCHNAME%%COMPNAME%_ReleaseDLL.7z
82-
%ZIP% a -t7z -mx4 -bb %OUTPUTDIR%\%ARCHNAME%%COMPNAME%_ReleaseDLL.7z -r -ir!lib\%COMPNAME%_dll\*.dll -xr!*ud_*.dll
82+
%ZIP% a -t7z -mx4 -bb %OUTPUTDIR%\%ARCHNAME%%COMPNAME%_ReleaseDLL.7z -r -ir!lib\%COMPNAME%_dll\*.dll -xr!*ud_*.dll docs\licence.txt
8383
set ERRLVL=%ERRLVL% / %ERRORLEVEL%
8484
echo %date% %time% : %COMPNAME%%XTRASPCS% archives : ERRORLEVEL=%ERRLVL% >> %MAINLOGFILE%
8585

build/tools/mingw/parameters.bat

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,13 @@ if "%2" == "" goto :NOPARAMS
1414

1515
rem Define compiler's bin directory
1616
if "%1" == "1220" (
17-
set COMPBINDIR=G:\msys64\mingw%2\bin
17+
set COMPBINDIR=G:\msys64-gcc1220\mingw%2\bin
1818
) else (
1919
set COMPBINDIR=G:\MinGW%1-%2\bin
2020
)
21+
if "%1" == "1320" (
22+
set COMPBINDIR=G:\msys64\mingw%2\bin
23+
)
2124
rem Define compiler's version string such as 810, 730_x64, 920TDM
2225
rem Also define extra spaces for "aligned" logs lines
2326
set COMPVERS=%1

0 commit comments

Comments
 (0)