adapted the library build scripts to CMake build wxWidgets

They now build considerably faster
This commit is contained in:
Cheng 2024-02-23 04:54:26 +00:00
parent 351f742183
commit 7b45929f64
No known key found for this signature in database
GPG Key ID: 571C3A9C3B9E6FCA
2 changed files with 82 additions and 48 deletions

View File

@ -29,22 +29,6 @@ IF %ERRORLEVEL% NEQ 0 (
GOTO:EOF GOTO:EOF
) )
echo on echo on
call msbuild.bat gc lib x64 Debug test
echo off
IF %ERRORLEVEL% NEQ 0 (
cd ..
PAUSE
GOTO:EOF
)
echo on
call msbuild.bat gc lib x64 Debug tune
echo off
IF %ERRORLEVEL% NEQ 0 (
cd ..
PAUSE
GOTO:EOF
)
echo on
call msbuild.bat gc lib x64 Release call msbuild.bat gc lib x64 Release
echo off echo off
IF %ERRORLEVEL% NEQ 0 ( IF %ERRORLEVEL% NEQ 0 (
@ -53,48 +37,36 @@ IF %ERRORLEVEL% NEQ 0 (
GOTO:EOF GOTO:EOF
) )
echo on echo on
call msbuild.bat gc lib x64 Release test
echo off
IF %ERRORLEVEL% NEQ 0 (
cd ..
PAUSE
GOTO:EOF
)
echo on
call msbuild.bat gc lib x64 Release tune
echo off
IF %ERRORLEVEL% NEQ 0 (
cd ..
PAUSE
GOTO:EOF
)
echo on
call msbuild.bat gc lib x64 Debug
echo off
IF %ERRORLEVEL% NEQ 0 (
cd ..
PAUSE
GOTO:EOF
)
echo on
cd ..\..\.. cd ..\..\..
cd wxWidgets\build\msw cd wxWidgets
msbuild wx_vc17.sln -m -p:Configuration=Release;Platform=x64;PlatformToolset=v143;WindowsTargetPlatformVersion=10.0 cmake . -Bbuild\msw\vc_x64_mswu
echo off echo off
IF %ERRORLEVEL% NEQ 0 ( IF %ERRORLEVEL% NEQ 0 (
PAUSE echo Failed during cmake create build directory
GOTO:EOF PAUSE
GOTO:EOF
) )
echo on echo on
msbuild wx_vc17.sln -m -p:Configuration=Debug;Platform=x64;PlatformToolset=v143;WindowsTargetPlatformVersion=10.0 cd build\msw\vc_x64_mswu
cmake --build . --config Release
echo off echo off
IF %ERRORLEVEL% NEQ 0 ( IF %ERRORLEVEL% NEQ 0 (
PAUSE echo Failed during cmake --build . --config Release
GOTO:EOF PAUSE
GOTO:EOF
) )
echo on echo on
cmake --build . --config Debug
IF %ERRORLEVEL% NEQ 0 (
echo Failed during cmake --build . --config Debug
PAUSE
GOTO:EOF
)
echo on
xcopy /E /F /Y lib ..\..\..\lib
cd ..\..\.. cd ..\..\..
cd ..
echo on
msbuild msvc/wallet.sln -p:Configuration=Debug;Platform=x64 -m msbuild msvc/wallet.sln -p:Configuration=Debug;Platform=x64 -m
echo off echo off
IF %ERRORLEVEL% NEQ 0 ( IF %ERRORLEVEL% NEQ 0 (

62
msvc/wxWidgets.bat Normal file
View File

@ -0,0 +1,62 @@
echo on
call C:\"Program Files (x86)"\"Microsoft Visual Studio"\2022\BuildTools\VC\Auxiliary\Build\vcvarsamd64_x86.bat
call C:\"Program Files"\"Microsoft Visual Studio"\2022\Community\VC\Auxiliary\Build\vcvars64.bat"
echo on
cd wxWidgets
cmake . -Bbuild\msw\vc_x64_mswu
echo off
IF %ERRORLEVEL% NEQ 0 (
echo Failed during cmake create build directory
PAUSE
GOTO:EOF
)
echo on
cd build\msw\vc_x64_mswu
cmake --build . --config Release
echo off
IF %ERRORLEVEL% NEQ 0 (
echo Failed during cmake --build . --config Release
PAUSE
GOTO:EOF
)
echo on
cmake --build . --config Debug
IF %ERRORLEVEL% NEQ 0 (
echo Failed during cmake --build . --config Debug
PAUSE
GOTO:EOF
)
echo on
xcopy /E /F /Y lib ..\..\..\lib
cd ..\..\..
cd ..
msbuild msvc/wallet.sln -p:Configuration=Debug;Platform=x64 -m
echo off
IF %ERRORLEVEL% NEQ 0 (
PAUSE
GOTO:EOF
)
echo on
msbuild msvc/wallet.sln -p:Configuration=Release;Platform=x64 -m
echo off
IF %ERRORLEVEL% NEQ 0 (
PAUSE
GOTO:EOF
)
echo on
.\build\Release\wallet.exe --complete --test
echo off
IF %ERRORLEVEL% NEQ 0 (
echo failed unit test on release build
) ELSE (
echo passed unit test on release build
)
echo on
.\build\Debug\wallet.exe --complete --test
echo off
IF %ERRORLEVEL% NEQ 0 (
echo failed unit test on debug build
) ELSE (
echo passed unit test on debug build
)