diff options
| author | Peter Foley <pefoley2@verizon.net> | 2012-08-31 13:24:00 -0400 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-10-07 10:42:17 +0200 |
| commit | 59bf5321fa4c49b0d140700e2c56de7e1b637926 (patch) | |
| tree | 44a58b2b28860fe36eac97b9f4bf23cff542f771 /scp2 | |
| parent | e994a91060c145ad08ef75dcf9862043202ac6ce (diff) | |
fix msm suport for VS2012
Change-Id: Ibc816de83eb48163671948ecc84e7653f2b4ec13
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/vc_redist.scp | 45 |
1 files changed, 43 insertions, 2 deletions
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp index c0e53020d1f9..fa7d1c268737 100644 --- a/scp2/source/ooo/vc_redist.scp +++ b/scp2/source/ooo/vc_redist.scp @@ -27,6 +27,8 @@ #include "macros.inc" +#if defined(WITH_VC90_REDIST) + MergeModule gid_MergeModule_Microsoft_VC90_CRT_x86 Feature = gm_Root; Name = "Microsoft_VC90_CRT_x86.msm"; @@ -34,6 +36,15 @@ MergeModule gid_MergeModule_Microsoft_VC90_CRT_x86 ComponentCondition = "VC_REDIST=1"; End +MergeModule gid_MergeModule_policy_9_0_Microsoft_VC90_CRT_x86 + Feature = gm_Root; + Name = "policy_9_0_Microsoft_VC90_CRT_x86.msm"; + RootDir = "TARGETDIR"; + ComponentCondition = "VC_REDIST=1"; +End + +#endif + #if defined(WITH_VC100_REDIST) MergeModule gid_MergeModule_Microsoft_VC100_CRT_x86 @@ -45,15 +56,21 @@ End #endif -MergeModule gid_MergeModule_policy_9_0_Microsoft_VC90_CRT_x86 +#if defined(WITH_VC110_REDIST) + +MergeModule gid_MergeModule_Microsoft_VC110_CRT_x86 Feature = gm_Root; - Name = "policy_9_0_Microsoft_VC90_CRT_x86.msm"; + Name = "Microsoft_VC110_CRT_x86.msm"; RootDir = "TARGETDIR"; ComponentCondition = "VC_REDIST=1"; End +#endif + #if defined(BUILD_X64) +#if defined(WITH_VC90_REDIST) + MergeModule gid_MergeModule_Microsoft_VC90_CRT_x86_x64 Feature = gm_Root; Name = "Microsoft_VC90_CRT_x86_x64.msm"; @@ -69,3 +86,27 @@ MergeModule gid_MergeModule_policy_9_0_Microsoft_VC90_CRT_x86_x64 End #endif + +#if defined(WITH_VC100_REDIST) + +MergeModule gid_MergeModule_Microsoft_VC100_CRT_x64 + Feature = gm_Root; + Name = "Microsoft_VC100_CRT_x64.msm"; + RootDir = "TARGETDIR"; + ComponentCondition = "VC_REDIST=1"; +End + +#endif + +#if defined(WITH_VC110_REDIST) + +MergeModule gid_MergeModule_Microsoft_VC110_CRT_x64 + Feature = gm_Root; + Name = "Microsoft_VC110_CRT_x64.msm"; + RootDir = "TARGETDIR"; + ComponentCondition = "VC_REDIST=1"; +End + +#endif + +#endif |