Merge branch 'release-2.5.0' of bitbucket.org:k1jt/wsjtx into release-2.5.0

This commit is contained in:
Joe Taylor 2021-06-10 11:45:15 -04:00
commit 6444c3e76b

View File

@ -141,7 +141,7 @@ C:\Tools\boost-build\MinGW32\bin\b2 -j8 toolset=gcc ^
--build-dir=%USERPROFILE%\build\boost ^ --build-dir=%USERPROFILE%\build\boost ^
address-model=32 architecture=x86 variant=debug,release ^ address-model=32 architecture=x86 variant=debug,release ^
link=shared threading=multi ^ link=shared threading=multi ^
--with-log --with-stacktrace --prefix=C:\Tools\boost install --with-log --with-stacktrace --with-timer --prefix=C:\Tools\boost install
If all is well you should see the following line about a 1/3 of the If all is well you should see the following line about a 1/3 of the
way through the initial configuration steps. way through the initial configuration steps.
@ -188,7 +188,7 @@ cd ..\..
C:\Tools\boost-build\MinGW64\bin\b2 -j8 toolset=gcc-8~64 ^ C:\Tools\boost-build\MinGW64\bin\b2 -j8 toolset=gcc-8~64 ^
address-model=64 architecture=x86 variant=debug,release ^ address-model=64 architecture=x86 variant=debug,release ^
link=shared threading=multi ^ link=shared threading=multi ^
--with-log --with-stacktrace ^ --with-log --with-stacktrace --with-timer ^
--build-dir=%USERPROFILE%\build\boost ^ --build-dir=%USERPROFILE%\build\boost ^
--prefix=C:\Tools\boost install --prefix=C:\Tools\boost install
@ -206,9 +206,11 @@ After some time it should complete with something like:
warnings can usually be ignored. If successful; you can release some warnings can usually be ignored. If successful; you can release some
space by cleaning the build tree: space by cleaning the build tree:
C:\Tools\boost-build\MinGW32\bin\b2 toolset=gcc-8~64 ^ C:\Tools\boost-build\MinGW64\bin\b2 toolset=gcc-8~64 ^
address-model=64 --build-dir=%USERPROFILE%\build\boost ^ address-model=64 --build-dir=%USERPROFILE%\build\boost ^
--build-type=complete clean --build-type=complete clean
Run-time Environment Run-time Environment
-------------------- --------------------