diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2017-03-04 14:36:08 +0100 |
|---|---|---|
| committer | David Ostrovsky <david@ostrovsky.org> | 2017-04-21 18:18:44 +0200 |
| commit | de030cd7a234fd9191364647deb1a4836ca992cb (patch) | |
| tree | 8ac04e8ec53eb01b15bde0d0b079602feafbb1d9 /scp2 | |
| parent | 489414f2395b6c8008ebcda7c37a150fd4ed7ad5 (diff) | |
gbuild: Remove MSVC 2013 legacy code
Uwinapi is discontinued.
Change-Id: I063b4d0d8fab2d60de168e960a63b8181158ac01
Reviewed-on: https://gerrit.libreoffice.org/23198
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
Tested-by: David Ostrovsky <david@ostrovsky.org>
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/vc_redist.scp | 19 | ||||
| -rw-r--r-- | scp2/source/winexplorerext/file_winexplorerext.scp | 60 |
2 files changed, 6 insertions, 73 deletions
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp index 160e73e25c91..9b534a3f27fd 100644 --- a/scp2/source/ooo/vc_redist.scp +++ b/scp2/source/ooo/vc_redist.scp @@ -18,25 +18,6 @@ #include "macros.inc" -#if defined(WITH_VC120_REDIST) - -#if defined WINDOWS_X64 -MergeModule gid_MergeModule_Microsoft_VC120_CRT_x64 -#else -MergeModule gid_MergeModule_Microsoft_VC120_CRT_x86 -#endif - Feature = gm_Root; -#if defined WINDOWS_X64 - Name = "Microsoft_VC120_CRT_x64.msm"; -#else - Name = "Microsoft_VC120_CRT_x86.msm"; -#endif - RootDir = "TARGETDIR"; - ComponentCondition = "VC_REDIST=1"; -End - -#endif - #if defined(WITH_VC140_REDIST) #if defined WINDOWS_X64 diff --git a/scp2/source/winexplorerext/file_winexplorerext.scp b/scp2/source/winexplorerext/file_winexplorerext.scp index 7567896b4b9f..45fc586e353e 100644 --- a/scp2/source/winexplorerext/file_winexplorerext.scp +++ b/scp2/source/winexplorerext/file_winexplorerext.scp @@ -23,65 +23,17 @@ Directory gid_Dir_Shlxthdl DosName = "shlxthdl"; End -#ifdef BUILD_X64 - -#if defined(WITH_VC100_REDIST) - -File gid_File_Lib_Msvcr100 - LIB_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Shlxthdl; - Name = "msvcr100.dll"; - ComponentCondition = "VersionNT64"; -End - -File gid_File_Lib_Msvcp100 - LIB_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Shlxthdl; - Name = "msvcp100.dll"; - ComponentCondition = "VersionNT64"; -End - -#endif - -#if defined(WITH_VC110_REDIST) +/* + * TODO(davido): Probably the redists need to be included for the supported compilers + */ -File gid_File_Lib_Msvcr110 - LIB_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Shlxthdl; - Name = "msvcr110.dll"; - ComponentCondition = "VersionNT64"; -End +#ifdef BUILD_X64 -File gid_File_Lib_Msvcp110 - LIB_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Shlxthdl; - Name = "msvcp110.dll"; - ComponentCondition = "VersionNT64"; -End +#if defined(WITH_VC140_REDIST) #endif -#if defined(WITH_VC120_REDIST) - -File gid_File_Lib_Msvcr120 - LIB_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Shlxthdl; - Name = "msvcr120.dll"; - ComponentCondition = "VersionNT64"; -End - -File gid_File_Lib_Msvcp120 - LIB_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Shlxthdl; - Name = "msvcp120.dll"; - ComponentCondition = "VersionNT64"; -End +#if defined(WITH_VC150_REDIST) #endif |