Merge both x64 and x86 CRT merge modules into x64 MSI

Desktop / LibreOffice - Mike Kaganski [collabora.com] - 13 January 2020 12:00 UTC

... 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

a4681e8b74a5 Merge both x64 and x86 CRT merge modules into x64 MSI
configure.ac | 9 +++----
scp2/source/ooo/vc_redist.scp | 55 +++++++++++++------------------------------
2 files changed, 19 insertions(+), 45 deletions(-)

Upstream: cgit.freedesktop.org


  • Share