Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update MinGW build tools (MinGW-1030-TDM and MSYS2 MinGW-1120)

Browse Source
This commit is contained in:
Xaviou
2022-04-03 10:45:07 +02:00
parent 5614f73b2b
commit d686a44b4f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/tools/mingw/buildall.bat
View File

@@ -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% echo %date% %time% : wxWidgets-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER% build started > %MAINLOGFILE%
rem Loop through all versions of the compiler 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 rem For each version, create a 32 and a 64 bits build
for %%a in ( 32 64 ) do ( for %%a in ( 32 64 ) do (
call officialbuild.bat %%c %%a call officialbuild.bat %%c %%a

6
build/tools/mingw/parameters.bat
View File

@@ -13,7 +13,7 @@ rem Check if architecture is present
if "%2" == "" goto :NOPARAMS if "%2" == "" goto :NOPARAMS
rem Define compiler's bin directory rem Define compiler's bin directory
if "%1" == "1020" ( if "%1" == "1120" (
set COMPBINDIR=G:\msys64\mingw%2\bin set COMPBINDIR=G:\msys64\mingw%2\bin
) else ( ) else (
set COMPBINDIR=G:\MinGW%1-%2\bin 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 rem Also define extra spaces for "aligned" logs lines
set COMPVERS=%1 set COMPVERS=%1
set XTRASPCS= : set XTRASPCS= :
if "%1" == "920" ( if "%1" == "1030" (
set COMPVERS=%COMPVERS%TDM set COMPVERS=%COMPVERS%TDM
) else ( ) else (
set XTRASPCS= %XTRASPCS% set XTRASPCS= %XTRASPCS%
@@ -32,7 +32,7 @@ if "%2" == "64" (
) else ( ) else (
set XTRASPCS= %XTRASPCS% 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% set COMPNAME=gcc%COMPVERS%
rem Simplified (but sufficient) PATH variable rem Simplified (but sufficient) PATH variable
set PATH=C:\Windows;C:\Windows\system32\;%COMPBINDIR% set PATH=C:\Windows;C:\Windows\system32\;%COMPBINDIR%