diff options
Diffstat (limited to 'scp2')
-rw-r--r-- | scp2/source/ooo/vc_redist.scp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp index b9ee3f2413b5..5b56739af581 100644 --- a/scp2/source/ooo/vc_redist.scp +++ b/scp2/source/ooo/vc_redist.scp @@ -42,9 +42,17 @@ End #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 |