diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-02-25 13:04:29 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-02-25 13:04:29 +0000 |
| commit | 8d1e32362e21e838d60648b0818a3cd7de69779e (patch) | |
| tree | 68370bb11353b7f7e36bd1b10718bc28750a4cf5 /scp2 | |
| parent | b8bbd2fbd18802cceb55a8aa937b9e7644ff1508 (diff) | |
INTEGRATION: CWS obo22 (1.273.16); FILE MERGED
2008/02/19 10:04:49 obo 1.273.16.1: #i85885# wntmsci11/12: rename stlport_vc8 to stlport_vc71 because of UNO compatibility
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 8a65d7c27d68..9040ad7cd94e 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -4,9 +4,9 @@ * * $RCSfile: file_library_ooo.scp,v $ * - * $Revision: 1.273 $ + * $Revision: 1.274 $ * - * last change: $Author: rt $ $Date: 2008-01-29 09:55:18 $ + * last change: $Author: obo $ $Date: 2008-02-25 14:04:29 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -2117,12 +2117,8 @@ File gid_File_Lib_Stlport #endif #endif #else - #ifdef M1310 + #if defined(M1310) || defined(M1400) || defined(M1500) Name = STRING(CONCAT3(stlport_,vc71_stldebug45,.dll)); - #elif defined(M1400) || defined(M1500) - Name = STRING(CONCAT3(stlport_,vc8_stldebug45,.dll)); - #else - Name = STRING(CONCAT3(stlport_,vc7_stldebug,.dll)); #endif #endif #else @@ -2141,15 +2137,11 @@ File gid_File_Lib_Stlport #endif #endif #else - #ifdef M1310 + #if defined(M1310) || defined(M1400) || defined(M1500) Name = STRING(CONCAT3(stlport_,vc7145,.dll)); - #elif defined(M1400) || defined(M1500) - Name = STRING(CONCAT3(stlport_,vc845,.dll)); #else #if defined(_gcc3) Name = STRING(CONCAT3(libstlport_,gcc,.dll)); - #else - Name = STRING(CONCAT3(stlport_,vc745,.dll)); #endif #endif #endif |