diff options
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 |