From 2476f8130beeddf6529b47e7f9c5a82f83b5ef4a Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Wed, 27 Aug 2008 12:44:55 +0000 Subject: INTEGRATION: CWS sb91 (1.10.22); FILE MERGED 2008/07/21 10:56:06 sb 1.10.22.2: RESYNC: (1.10-1.11); FILE MERGED 2008/07/14 12:58:10 sb 1.10.22.1: #i91567# adapt to unxsolu4 --- scp2/source/ooo/ure.scp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'scp2/source/ooo/ure.scp') diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index f8e6fd01ce01..ee49e579b604 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.12 $ + * $Revision: 1.13 $ * * This file is part of OpenOffice.org. * @@ -837,7 +837,8 @@ File gid_File_Dl_Libxml2 End #endif -#if !defined USE_SYSTEM_STL +#if !defined USE_SYSTEM_STL || \ + (defined USE_SYSTEM_STL && defined _C52 && defined IS_LP64) File gid_File_Dl_Stlport TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; @@ -854,11 +855,15 @@ File gid_File_Dl_Stlport Name = SCP2_URE_DL_NORMAL("stlport_gcc"); #endif #elif defined SOLARIS +#if defined IS_LP64 + Name = SCP2_URE_DL_VER("stlport", "1"); +#else #if defined _STLP_DEBUG Name = SCP2_URE_DL_NORMAL("stlport_sunpro_debug"); #else Name = SCP2_URE_DL_NORMAL("stlport_sunpro"); #endif +#endif #elif defined WNT && (defined(M1310) || defined(M1400) || defined(M1500) ) #if defined _STLP_DEBUG Name = SCP2_URE_DL_NORMAL("stlport_vc71_stldebug45"); -- cgit