diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-06-02 22:38:06 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2019-08-30 23:32:19 +0200 |
| commit | d58ca6be65deb8fa8f43793f922c1fd6570fcd97 (patch) | |
| tree | 889a109a09302b3b75e62fc1826d723706af742a | |
| parent | 8452ab981bb7b70801acb0e64bc720a4e22e7bef (diff) | |
scp2: package 64-bit MSVC runtimes for explorer extensions
Not a backport because master is a bit too refactored now.
Reviewed-on: https://gerrit.libreoffice.org/38365
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit ab4344c34ddf048adf9a3fad0dd1fa2970935550)
Conflicts:
scp2/source/winexplorerext/file_winexplorerext.scp
Change-Id: I1eccb99252fb66dc1fcc9cb5af978c61717ff629
| -rw-r--r-- | scp2/source/winexplorerext/file_winexplorerext.scp | 11 | ||||
| -rw-r--r-- | scp2/source/winexplorerext/module_winexplorerext.scp | 5 |
2 files changed, 12 insertions, 4 deletions
diff --git a/scp2/source/winexplorerext/file_winexplorerext.scp b/scp2/source/winexplorerext/file_winexplorerext.scp index 7567896b4b9f..7ca1f9c6a63d 100644 --- a/scp2/source/winexplorerext/file_winexplorerext.scp +++ b/scp2/source/winexplorerext/file_winexplorerext.scp @@ -85,4 +85,15 @@ End #endif +#if defined(WITH_VC140_REDIST) || defined(WITH_VC150_REDIST) + +File gid_File_X64_Redist + Styles = (FILELIST, USE_INTERNAL_RIGHTS, PACKED); + Dir = FILELIST_DIR; + Name = "msvc_dlls.filelist"; + ComponentCondition = "VersionNT64"; +End + +#endif + #endif diff --git a/scp2/source/winexplorerext/module_winexplorerext.scp b/scp2/source/winexplorerext/module_winexplorerext.scp index 440945e89096..b71153cd0052 100644 --- a/scp2/source/winexplorerext/module_winexplorerext.scp +++ b/scp2/source/winexplorerext/module_winexplorerext.scp @@ -49,9 +49,6 @@ Module gid_Module_Optional_Winexplorerext_x64 Dirs = (gid_Dir_Shlxthdl); Files = (auto_winexplorerextwin64_ALL, auto_winexplorerextwin64nt6_ALL, - gid_File_Lib_Msvcp100, - gid_File_Lib_Msvcr100, - gid_File_Lib_Msvcp110, - gid_File_Lib_Msvcr110); + gid_File_X64_Redist); End #endif |