From f75b4aba4a528347e3971fff1261dde96d91f1cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Timm?= Date: Mon, 5 Sep 2005 08:09:32 +0000 Subject: [PATCH] INTEGRATION: CWS hr18 (1.131.4); FILE MERGED 2005/08/18 15:29:58 hr 1.131.4.2: RESYNC: (1.131-1.136); FILE MERGED 2005/08/10 13:07:53 hr 1.131.4.1: #i53108#; enable building and packing with the debug version of STLport --- scp2/source/ooo/file_library_ooo.scp | 30 ++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 460888f63b4e..f3514e7ce58f 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -2,9 +2,9 @@ * * $RCSfile: file_library_ooo.scp,v $ * -* $Revision: 1.137 $ +* $Revision: 1.138 $ * -* last change: $Author: rt $ $Date: 2005-08-18 08:12:56 $ +* last change: $Author: rt $ $Date: 2005-09-05 09:09:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1710,6 +1710,31 @@ File gid_File_Lib_Stlport TXT_FILE_BODY; Styles = (PACKED); Dir = gid_Dir_Program; + #ifdef _STLP_DEBUG + #ifdef UNX + #if defined(_gcc3) || defined(_GCC) + #ifdef IRIX + Name = STRING(CONCAT3(libstlport_,gcc_stldebug,.so.4.5)); + #else + Name = STRING(CONCAT3(libstlport_,gcc_stldebug,UNXSUFFIX)); + #endif + #else + #ifdef SOLARIS + Name = STRING(CONCAT3(libstlport_,sunpro_debug,.so)); + #else + Name = STRING(CONCAT4(libstlport_,COMNAME,_debug,.so)); + #endif + #endif + #else + #ifdef M1300 + Name = STRING(CONCAT3(stlport_,vc74_stldebug5,.dll)); + #elif defined(M1310) + Name = STRING(CONCAT3(stlport_,vc71_stldebug45,.dll)); + #else + Name = STRING(CONCAT3(stlport_,vc6_stldebug,.dll)); + #endif + #endif + #else #ifdef UNX #if defined(_gcc3) || defined(_GCC) #ifdef IRIX @@ -1733,6 +1758,7 @@ File gid_File_Lib_Stlport Name = STRING(CONCAT3(stlport_,vc6,.dll)); #endif #endif + #endif End #endif