strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS ooo20040329 (1.6.2); FILE MERGED

Browse source 
2004/04/08 07:05:06 svesik 1.6.2.4: RESYNC: (1.6-1.10); FILE MERGED
2004/03/26 20:02:23 khendricks 1.6.2.3: vcl gtk plugin should not be needed on MacOSX
libstlport.dylib no longer is built with or needs *.4.5 at the end
2004/03/26 19:55:50 khendricks 1.6.2.2: Hamburg needs another big sign that says
unix != .so since MacOSX uses .dylib
:-)
2004/03/16 00:17:16 khendricks 1.6.2.1: Handling MacOSX use of .dylib and not .so for myspell
This commit is contained in:
Sander Vesik 2004-04-21 12:38:27 +00:00
parent ceac00bb7e
commit 111d37e3d7
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
scp2/source/ooo/file_library_ooo.scp
View file

@ -2,9 +2,9 @@
*
* $RCSfile: file_library_ooo.scp,v $
*
* $Revision: 1.13 $
* $Revision: 1.14 $
*
* last change: $Author: svesik $ $Date: 2004-04-21 12:22:43 $
* last change: $Author: svesik $ $Date: 2004-04-21 13:38:27 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -58,7 +58,6 @@
*
*
************************************************************************/
#include "macros.inc"
STD_UNO_LIB_FILE( gid_File_Lib_Abp, abp)
@ -1235,8 +1234,10 @@ STD_SETUPZIP_LIB_FILE( gid_File_Lib_Vclplug_Gen, vclplug_gen )
#endif
#ifdef UNX
#ifndef MACOSX
STD_SETUPZIP_LIB_FILE( gid_File_Lib_Vclplug_Gtk, vclplug_gtk )
#endif
#endif
File gid_File_Lib_Rdbtdp
TXT_FILE_BODY;
@ -1340,7 +1341,11 @@ STD_UNO_LIB_FILE( gid_File_Lib_Scn, scn)
File gid_File_Lib_Scriptframe
TXT_FILE_BODY;
#ifdef UNX
Name = "libscriptframe.so";
#ifdef MACOSX
Name = "libscriptframe.dylib";
#else
Name = "libscriptframe.so";
#endif
#else
Name = "scriptframe.dll";
#endif
@ -1472,8 +1477,6 @@ File gid_File_Lib_Stlport
#if defined(_gcc3) || defined(_GCC)
#ifdef IRIX
Name = STRING(CONCAT3(libstlport_,gcc,.so.4.5));
#elif defined(MACOSX)
Name = STRING(CONCAT4(libstlport_,gcc,UNXSUFFIX,.4.5));
#else
Name = STRING(CONCAT3(libstlport_,gcc,UNXSUFFIX));
#endif
@ -1652,7 +1655,11 @@ File gid_File_Lib_Myspell
TXT_FILE_BODY;
Dir = gid_Dir_Program;
#ifdef UNX
Name = "libmyspell.so";
#ifdef MACOSX
Name = "libmyspell.dylib";
#else
Name = "libmyspell.so";
#endif
#else
Name = "myspell.dll";
#endif