diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-06-02 22:47:23 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-06-06 13:05:42 +0200 |
| commit | 9b50c4f63c2ecb95245511940dacb3e91027499f (patch) | |
| tree | 12e8c2e3a2187e5d2667af8b1c1b4765b7f145be /scp2/source | |
| parent | 2a39dc74724d3648ff76aa900edfebe0dd19b296 (diff) | |
scp2: package 64-bit MSVC runtimes for explorer extensions
... and add BUILD_X64 conditional.
Change-Id: Id512368dfd9dece583ead5aae1924db96f8a2a40
Reviewed-on: https://gerrit.libreoffice.org/38366
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'scp2/source')
| -rw-r--r-- | scp2/source/winexplorerext/file_winexplorerext.scp | 15 | ||||
| -rw-r--r-- | scp2/source/winexplorerext/module_winexplorerext.scp | 6 |
2 files changed, 1 insertions, 20 deletions
diff --git a/scp2/source/winexplorerext/file_winexplorerext.scp b/scp2/source/winexplorerext/file_winexplorerext.scp index 45fc586e353e..50bcfc3f3901 100644 --- a/scp2/source/winexplorerext/file_winexplorerext.scp +++ b/scp2/source/winexplorerext/file_winexplorerext.scp @@ -23,18 +23,3 @@ Directory gid_Dir_Shlxthdl DosName = "shlxthdl"; End -/* - * TODO(davido): Probably the redists need to be included for the supported compilers - */ - -#ifdef BUILD_X64 - -#if defined(WITH_VC140_REDIST) - -#endif - -#if defined(WITH_VC150_REDIST) - -#endif - -#endif diff --git a/scp2/source/winexplorerext/module_winexplorerext.scp b/scp2/source/winexplorerext/module_winexplorerext.scp index d0383b6e036c..97bfc231769a 100644 --- a/scp2/source/winexplorerext/module_winexplorerext.scp +++ b/scp2/source/winexplorerext/module_winexplorerext.scp @@ -44,10 +44,6 @@ Module gid_Module_Optional_Winexplorerext_x64 Default = YES; Styles = (HIDDEN_ROOT); Dirs = (gid_Dir_Shlxthdl); - Files = (auto_winexplorerextwin64_ALL, - gid_File_Lib_Msvcp100, - gid_File_Lib_Msvcr100, - gid_File_Lib_Msvcp110, - gid_File_Lib_Msvcr110); + Files = (auto_winexplorerextwin64_ALL); End #endif |