diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-29 19:12:56 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-30 00:01:33 +0100 |
| commit | 97c62ed88419f7288ce1b365474c65038253608e (patch) | |
| tree | 93beba8d7d023617eb0b92753abc70bf899bbdef /scp2 | |
| parent | 050f342234e4e321d73d6c0630696ce71080ee26 (diff) | |
scp2: remove obsolete WITH_VC90_REDIST
Change-Id: I9f7bbce8096f49851dc643b46ebed8308026c8d2
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/vc_redist.scp | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp index 1965486bba0d..e1c114c04b48 100644 --- a/scp2/source/ooo/vc_redist.scp +++ b/scp2/source/ooo/vc_redist.scp @@ -18,24 +18,6 @@ #include "macros.inc" -#if defined(WITH_VC90_REDIST) - -MergeModule gid_MergeModule_Microsoft_VC90_CRT_x86 - Feature = gm_Root; - Name = "Microsoft_VC90_CRT_x86.msm"; - RootDir = "TARGETDIR"; - 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 @@ -58,24 +40,3 @@ 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"; - RootDir = "TARGETDIR"; - ComponentCondition = "(VC_REDIST=1) AND VersionNT64"; -End - -MergeModule gid_MergeModule_policy_9_0_Microsoft_VC90_CRT_x86_x64 - Feature = gm_Root; - Name = "policy_9_0_Microsoft_VC90_CRT_x86_x64.msm"; - RootDir = "TARGETDIR"; - ComponentCondition = "(VC_REDIST=1) AND VersionNT64"; -End - -#endif - -#endif |