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

INTEGRATION: CWS ooo20040704 (1.23.2); FILE MERGED

Browse source 
2004/08/09 14:45:45 vg 1.23.2.6: RESYNC MERGED 1.24 1.27
Everything below this line will be added to the revision comment.
2004/07/19 18:08:11 svesik 1.23.2.5: RESYNC: (1.23-1.24); FILE MERGED
2004/07/05 13:55:51 cmc 1.23.2.4: #i30801# make curl an optional compile
2004/07/02 17:04:51 cmc 1.23.2.3: #i30891# revert header and namespace change
2004/07/02 16:23:22 cmc 1.23.2.2: #i30891# revert header and namespace change
2004/06/30 15:47:24 cmc 1.23.2.1: #i30801# allow using system libs if possible
This commit is contained in:
Rüdiger Timm 2004-09-09 07:09:13 +00:00
parent 3a294ae413
commit 9313a41ef9
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,9 +2,9 @@
*
* $RCSfile: file_library_ooo.scp,v $
*
* $Revision: 1.43 $
* $Revision: 1.44 $
*
* last change: $Author: hr $ $Date: 2004-09-08 17:14:01 $
* last change: $Author: rt $ $Date: 2004-09-09 08:09:13 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -370,6 +370,8 @@ STD_UNO_LIB_FILE( gid_File_Lib_Ctl , ctl)
STD_LIB_FILE( gid_File_Lib_Cui, cui)
#ifndef SYSTEM_CURL
File gid_File_Lib_Curl
TXT_FILE_BODY;
Styles = (PACKED);
@ -381,6 +383,10 @@ File gid_File_Lib_Curl
#endif
End
#endif
#ifndef SYSTEM_DB3
File gid_File_Lib_Db31
TXT_FILE_BODY;
Styles = (PACKED);
@ -393,13 +399,13 @@ File gid_File_Lib_Db31
End
#ifdef UNX
File gid_File_Lib_Db_Cxx
TXT_FILE_BODY;
Styles = (PACKED);
Dir = gid_Dir_Program;
Name = STRING(CONCAT2(libdb_cxx-3.2,UNXSUFFIX));
End
#endif
#endif
@ -615,7 +621,7 @@ End
#ifdef UNX
#ifndef MACOSX
#if ! (defined(MACOSX) || defined (SYSTEM_FREETYPE))
File gid_File_Lib_Freetype
#ifdef LINUX
@ -1613,6 +1619,7 @@ STD_UNO_LIB_FILE( gid_File_Lib_Spl, spl)
SPECIAL_UNO_LIB_FILE(gid_File_Lib_Srtrs1,srtrs1)
#ifndef USE_SYSTEM_STL
File gid_File_Lib_Stlport
TXT_FILE_BODY;
Styles = (PACKED, SETUPZIP);
@ -1641,6 +1648,7 @@ File gid_File_Lib_Stlport
#endif
#endif
End
#endif
File gid_File_Lib_Stm
TXT_FILE_BODY;
@ -1905,8 +1913,10 @@ STD_UNO_LIB_FILE( gid_File_Lib_Xsltfilter, xsltfilter )
STD_UNO_LIB_FILE( gid_File_Lib_Xmlfa, xmlfa )
STD_UNO_LIB_FILE( gid_File_Lib_Xmlfd, xmlfd )
#ifdef SOLAR_JAVA
UNO_JAR_FILE( gid_File_Jar_Xsltfilter, XSLTFilter )
UNO_JAR_FILE( gid_File_Jar_Xsltvalidate, XSLTValidate )
#endif
#ifdef UNX
@ -1914,6 +1924,7 @@ STD_SETUPZIP_LIB_FILE( gid_File_Lib_Zip, zip )
#endif
#ifndef SYSTEM_LIBXML
File gid_File_Lib_Xml2
TXT_FILE_BODY;
Styles = (PACKED,SETUPZIP);
@ -1924,8 +1935,8 @@ File gid_File_Lib_Xml2
Name = "libxml2.dll";
#endif
End
#endif
#ifdef SOLAR_JAVA
File gid_File_Lib_Jvmfwk
TXT_FILE_BODY;
Dir = gid_Dir_Program;
@ -1936,7 +1947,6 @@ File gid_File_Lib_Jvmfwk
#endif
Styles = (PACKED,SETUPZIP);
End
#endif
#ifdef SOLAR_JAVA
File gid_File_Lib_Sunjavaplugin