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

Update to reflect use of vc14x binary in place of vc14[012]

Browse Source 
Closes https://github.com/wxWidgets/wxWidgets/pull/1608
This commit is contained in:
Danny Scott
2019-10-18 09:46:45 -03:00
committed by Vadim Zeitlin
parent c4e914784a
commit 0a8cb849b5
2 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
docs/contributing/how-to-release.md
View File

@@ -157,7 +157,7 @@ in the generated files too.
To build official x86 and x64 shared binaries the following are prerequisites: To build official x86 and x64 shared binaries the following are prerequisites:
- Visual Studio 2008, 2010, 2012, 2013, 2015, 2017, 2019 - Visual Studio 2008, 2010, 2012, 2013 and 2015
- Windows SDK 6.1, 7.1 (required for x64 builds for Visual Studio 2008, 2010) - Windows SDK 6.1, 7.1 (required for x64 builds for Visual Studio 2008, 2010)
- 7z (required for packaging the files) - 7z (required for packaging the files)
- fciv (required for generating the checksums) - fciv (required for generating the checksums)
@@ -172,15 +172,6 @@ WINDOWS71SDK
If either of these are blank they are set to the default install location. If either of these are blank they are set to the default install location.
For Visual Studio 2017 and 2019 the VSxxxxCOMNTOOLS environment variable is not
set by the installer as these two versions support multiple toolsets.
The build script will check the following in sequence:
- If VSxxxCOMNTOOLS is set (xxx=141: VS2017, xxx=142: VS2019) it is used as
the path to call VsDevCmd.bat to set up the environmet.
- If VSxxxCOMNTOOLS is not set, then the Visual Studio tool vswhere is used
to find the latest installed toolset for the compiler and the associated
VsDevCmd.bat file is used to set up the environment.
To build binaries for a single compiler, open a command prompt (for Visual To build binaries for a single compiler, open a command prompt (for Visual
Studio 2008 only an SDK 6.1 developer's command prompt must be used), Studio 2008 only an SDK 6.1 developer's command prompt must be used),
cd to the build\tools\msvs folder and run the batch file 'officialbuild' cd to the build\tools\msvs folder and run the batch file 'officialbuild'
@@ -190,9 +181,10 @@ with the vcXXX version number:
Visual Studio 2010 vc100 Visual Studio 2010 vc100
Visual Studio 2012 vc110 Visual Studio 2012 vc110
Visual Studio 2014 vc120 Visual Studio 2014 vc120
Visual Studio 2015 vc140 Visual Studio 2015 vc14x
Visual Studio 2017 vc141
Visual Studio 2019 vc142 The Visual Studio 2015, 2017 and 2019 are binary compatible, allowing the
vc14x binary to be used with any of them.
This will build all of the x86 and x64 binaries for the selected compiler version, This will build all of the x86 and x64 binaries for the selected compiler version,
package them in 7z files and calculate the checksums. The 7z files and the package them in 7z files and calculate the checksums. The 7z files and the

12
docs/msw/binaries.md
View File

@@ -7,8 +7,8 @@ Supported Compilers
------------------- -------------------
We provide pre-built binary files for the following compilers: We provide pre-built binary files for the following compilers:
* Microsoft Visual C++ compiler versions 9.0, 10.0, 11.0, 12.0, 14.0 and 14.1 * Microsoft Visual C++ compiler versions 9.0, 10.0, 11.0, 12.0, 14.0, 14.1 and 14.2
(corresponding to marketing product names of Microsoft Visual Studio 2008, 2010, 2012, 2013, 2015 and 2017 respectively). (corresponding to marketing product names of Microsoft Visual Studio 2008, 2010, 2012, 2013, 2015, 2017 and 2019 respectively).
* TDM-GCC version 5.1 and MinGW-w64 version 7.2 (with the default SJLJ * TDM-GCC version 5.1 and MinGW-w64 version 7.2 (with the default SJLJ
exceptions propagation method, using C++11). Please note that you need to use exceptions propagation method, using C++11). Please note that you need to use
the very latest MinGW-w64 7.2 compiler release with this version of the the very latest MinGW-w64 7.2 compiler release with this version of the
@@ -27,15 +27,15 @@ First, you need to get the correct files. You will always need the
`wxWidgets-3.1.1-headers.7z` one but the rest depends on your compiler version `wxWidgets-3.1.1-headers.7z` one but the rest depends on your compiler version
and architecture: as different versions of MSVC compiler are not binary and architecture: as different versions of MSVC compiler are not binary
compatible, you should select the files with the correct compatible, you should select the files with the correct
`vc80`, `vc90`, `vc100`, `vc110`, `vc120`, `vc140` or `vc141` `vc80`, `vc90`, `vc100`, `vc110`, `vc120`, or `vc14x`
suffix depending on whether you use suffix depending on whether you use
Visual Studio 2005, 2008, 2010, 2012, 2013, 2015 or 2017 respectively. Visual Studio 2005, 2008, 2010, 2012, 2013, or 2015/2017/2019 respectively (the Visual Studio 2015/2017/2019 compilers are binary compatible).
You also need to decide whether you use the `x64` files for 64-bit development You also need to decide whether you use the `x64` files for 64-bit development
or the ones without this suffix for the still more common 32-bit builds. After or the ones without this suffix for the still more common 32-bit builds. After
determining the combination of suffixes you need, you should download the determining the combination of suffixes you need, you should download the
"Dev" and the "ReleaseDLL" files in addition to the "Headers" one above, "Dev" and the "ReleaseDLL" files in addition to the "Headers" one above,
e.g. for 32-bit MSVS 2017 development you need e.g. for 32-bit MSVS 2017 development you need
`wxMSW-3.1.1_vc141_Dev.7z` and `wxMSW-3.1.1_vc141_ReleaseDLL.7z`. `wxMSW-3.1.1_vc14x_Dev.7z` and `wxMSW-3.1.1_vc14x_ReleaseDLL.7z`.
All binaries are available at: All binaries are available at:
@@ -59,7 +59,7 @@ following:
Directories". Notice that the order is important here, putting the Directories". Notice that the order is important here, putting the
MSVC-specific directory first ensures that you use `wx/setup.h` MSVC-specific directory first ensures that you use `wx/setup.h`
automatically linking in wxWidgets libraries. automatically linking in wxWidgets libraries.
* Add `WXUSINGDLL` and `wxMSVC_VERSION_AUTO` to the list of defined * Add `WXUSINGDLL` and `wxMSVC_VERSION_ABI_COMPAT` to the list of defined
symbols in "Preprocessor Definitions". The first should be symbols in "Preprocessor Definitions". The first should be
self-explanatory (we only provide DLLs, not static libraries) while the self-explanatory (we only provide DLLs, not static libraries) while the
second one is necessary to use the libraries from e.g. `lib\vc100_dll` second one is necessary to use the libraries from e.g. `lib\vc100_dll`