mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add MSVC 14.0 runtime merge modules

Browse Source 
Change-Id: Ib32a4f2484466802ac6c9152e8dd41fc8c67aa46
Reviewed-on: https://gerrit.libreoffice.org/18560
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
Tested-by: David Ostrovsky <david@ostrovsky.org>
This commit is contained in:
Andras Timar
2015-09-14 00:01:39 -07:00
committed by David Ostrovsky
parent 1fe9270955
commit 14fc882e5c
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@@ -5258,7 +5258,7 @@ find_msms()
my_msm_file=Microsoft_VC${VCVER}_CRT_x86.msm my_msm_file=Microsoft_VC${VCVER}_CRT_x86.msm
AC_MSG_CHECKING([for $my_msm_file]) AC_MSG_CHECKING([for $my_msm_file])
msmdir= msmdir=
for ver in 12.0; do for ver in 12.0 14.0; do
reg_get_value_32 HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/$ver/Setup/VS/MSMDir reg_get_value_32 HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/$ver/Setup/VS/MSMDir
if test -n "$regvalue"; then if test -n "$regvalue"; then
if test -e "$regvalue/$my_msm_file"; then if test -e "$regvalue/$my_msm_file"; then

19
scp2/source/ooo/vc_redist.scp
View File

@@ -59,3 +59,22 @@ End
#endif #endif
#if defined(WITH_VC140_REDIST)
#if defined WINDOWS_X64
MergeModule gid_MergeModule_Microsoft_VC140_CRT_x64
#else
MergeModule gid_MergeModule_Microsoft_VC140_CRT_x86
#endif
Feature = gm_Root;
#if defined WINDOWS_X64
Name = "Microsoft_VC140_CRT_x64.msm";
#else
Name = "Microsoft_VC140_CRT_x86.msm";
#endif
RootDir = "TARGETDIR";
ComponentCondition = "VC_REDIST=1";
End
#endif