diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2020-01-13 13:08:02 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2020-01-13 13:00:04 +0100 |
| commit | a4681e8b74a59439110af42ff18cce021512056d (patch) | |
| tree | 1086ba3fe220b55f1bce64e4410ed75a3aa70299 /smoketest | |
| parent | 353d4528b8ad8abca9a13f3016632e42bab7afde (diff) | |
Merge both x64 and x86 CRT merge modules into x64 MSI
... because it contains x86 binaries in addition to x64: e.g., twain32shim,
spsupp_x86.
The opposite (inclusion of x64 MSM into x86 MSI) is not possible ( see
https://stackoverflow.com/questions/58181986 ), so do it just for x64 MSI.
And fix inclusion of CRT MSMs in VS2019, which were detected in configure.ac,
but not used in scp2/source/ooo/vc_redist.scp.
Change-Id: I3935fce751b1b6d04291fede6b82be25fe541582
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86667
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'smoketest')
0 files changed, 0 insertions, 0 deletions