diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-06-30 14:25:02 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-06-30 14:25:02 +0000 |
| commit | 96cff5c7e56e2ae6dfd04bad15280e8cab4293d3 (patch) | |
| tree | 767ef2437e412a21c6315c347b1ce07145f2531f /scp2/source/ooo/ure.scp | |
| parent | 8e3c80d9c1a5465011108932cd19b7f7843b0310 (diff) | |
INTEGRATION: CWS native160 (1.7.16); FILE MERGED
2008/06/24 10:38:35 is 1.7.16.1: #i88671# merging msvc90 libraries
Diffstat (limited to 'scp2/source/ooo/ure.scp')
| -rwxr-xr-x | scp2/source/ooo/ure.scp | 66 |
1 files changed, 1 insertions, 65 deletions
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index 0170e32a3d66..d6c4ca9f69ac 100755 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ure.scp,v $ - * $Revision: 1.9 $ + * $Revision: 1.10 $ * * This file is part of OpenOffice.org. * @@ -241,66 +241,6 @@ End #endif #endif -#if defined(WNT) -#if defined(M1500) -File gid_File_Lib_Msvcr90_Ure - BIN_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_URE_DL_DIR; -#ifndef _STLP_DEBUG - Name = "msvcr90.dll"; -#else - Name = "msvcr90d.dll"; -#endif -End -#endif -#endif - -#if defined(WNT) -#if defined(M1500) -File gid_File_Lib_Msvcp90_Ure - BIN_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_URE_DL_DIR; -#ifndef _STLP_DEBUG - Name = "msvcp90.dll"; -#else - Name = "msvcp90d.dll"; -#endif -End -#endif -#endif - -#if defined(WNT) -#if defined(M1500) -File gid_File_Lib_Msvcm90_Ure - BIN_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_URE_DL_DIR; -#ifndef _STLP_DEBUG - Name = "msvcm90.dll"; -#else - Name = "msvcm90d.dll"; -#endif -End -#endif -#endif - -#if defined(WNT) -#if defined(M1500) -File gid_File_Msvcm90crt_Manifest_Ure - BIN_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_URE_DL_DIR; -#ifndef _STLP_DEBUG - Name = "Microsoft.VC90.CRT.manifest"; -#else - Name = "Microsoft.VC90.DebugCRT.manifest"; -#endif -End -#endif -#endif - File gid_File_Dl_Cppu TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; @@ -1209,10 +1149,6 @@ Module gid_Module_Root_Ure_Hidden gid_File_Lib_Msvcp80_Ure, gid_File_Lib_Msvcm80_Ure, gid_File_Msvcm80crt_Manifest_Ure, - gid_File_Lib_Msvcr90_Ure, - gid_File_Lib_Msvcp90_Ure, - gid_File_Lib_Msvcm90_Ure, - gid_File_Msvcm90crt_Manifest_Ure, gid_File_Java_UnoloaderJar, gid_File_Java_JuhJar, gid_File_Java_JurtJar, |