diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-06-30 14:24:33 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-06-30 14:24:33 +0000 |
| commit | 240d55632a37017601b2d53b1186e818340114e0 (patch) | |
| tree | 89f095da8b3f45963f8f4bdc0d8aada1fe91e2fa /scp2/source/ooo/mergemodules_ooo.scp | |
| parent | 75e43d9d4c41a0910dcb8232100b124334d3ca51 (diff) | |
INTEGRATION: CWS native160 (1.3.84); FILE MERGED
2008/06/24 15:04:15 is 1.3.84.2: #i88671# merging msvc90 libraries
2008/06/24 10:38:35 is 1.3.84.1: #i88671# merging msvc90 libraries
Diffstat (limited to 'scp2/source/ooo/mergemodules_ooo.scp')
| -rwxr-xr-x | scp2/source/ooo/mergemodules_ooo.scp | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/scp2/source/ooo/mergemodules_ooo.scp b/scp2/source/ooo/mergemodules_ooo.scp index 1392f3802394..ca4cf0d0f68c 100755 --- a/scp2/source/ooo/mergemodules_ooo.scp +++ b/scp2/source/ooo/mergemodules_ooo.scp @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: mergemodules_ooo.scp,v $ - * $Revision: 1.3 $ + * $Revision: 1.4 $ * * This file is part of OpenOffice.org. * @@ -30,28 +30,30 @@ #include "macros.inc" -#ifdef M1400 -MergeModule gid_Mergemodule_Microsoft_Vc80_Crt_X86 +#ifdef M1500 +MergeModule gid_Mergemodule_Microsoft_Vc90_Crt_X86 #ifdef _STLP_DEBUG - Name = "Microsoft_VC80_DebugCRT_x86.msm"; + Name = "Microsoft_VC90_DebugCRT_x86.msm"; #else - Name = "Microsoft_VC80_CRT_x86.msm"; + Name = "Microsoft_VC90_CRT_x86.msm"; #endif - Cabfilename = "%UNIXPRODUCTNAME-vc80crt.cab"; + Cabfilename = "openoffice.org-vc90crt.cab"; Feature = "gm_Root"; RootDir = "TARGETDIR"; + Styles = (REMOVE_FILE_TABLE); End #endif -#ifdef M1400 -MergeModule gid_Mergemodule_Policy_Microsoft_Vc80_Crt_X86 +#ifdef M1500 +MergeModule gid_Mergemodule_Policy_Microsoft_Vc90_Crt_X86 #ifdef _STLP_DEBUG - Name = "policy_8_0_Microsoft_VC80_DebugCRT_x86.msm"; + Name = "policy_9_0_Microsoft_VC90_DebugCRT_x86.msm"; #else - Name = "policy_8_0_Microsoft_VC80_CRT_x86.msm"; + Name = "policy_9_0_Microsoft_VC90_CRT_x86.msm"; #endif - Cabfilename = "%UNIXPRODUCTNAME-policy-vc80crt.cab"; + Cabfilename = "openoffice.org-policy-vc90crt.cab"; Feature = "gm_Root"; RootDir = "TARGETDIR"; + Styles = (REMOVE_FILE_TABLE); End #endif |