INTEGRATION: CWS gcj3 (1.73.34); FILE MERGED

2005/03/09 12:40:07 cmc 1.73.34.3: #i44359# wizards now compile with gcj
2005/03/08 16:13:51 cmc 1.73.34.2: #i44359# more of scripting now compilable with gcj
2005/03/07 15:20:57 cmc 1.73.34.1: #i44359# hsqldb can be built with gcj now
This commit is contained in:
Oliver Bolte 2005-03-15 08:23:29 +00:00
parent 556356510c
commit e5f42d80e4

View file

@ -725,11 +725,6 @@ End
#ifdef SOLAR_JAVA
#ifndef GCJ
/*
GCJ because com.sun.star.wizards.tutorial.creator.frame.Framework cannot be
built with gcj
*/
UNO_JAR_FILE( gid_File_Jar_Report, report )
UNO_JAR_FILE( gid_File_Jar_Table, table )
UNO_JAR_FILE( gid_File_Jar_Letter, letter )
@ -737,20 +732,12 @@ UNO_JAR_FILE( gid_File_Jar_Form, form )
UNO_JAR_FILE( gid_File_Jar_Fax, fax )
UNO_JAR_FILE( gid_File_Jar_Agenda, agenda )
UNO_JAR_FILE( gid_File_Jar_Query, query )
#endif
#endif
#ifdef SOLAR_JAVA
#ifndef GCJ
STD_JAR_FILE( gid_File_Jar_Hsqldb, hsqldb )
STD_JAR_FILE( gid_File_Jar_Hsqldb_Sdbc, sdbc_hsqldb )
#endif
#endif
#ifdef SOLAR_JAVA
#ifndef GCJ
UNO_JAR_FILE( gid_File_Jar_Web, web )
#endif
#ifdef SOLAR_JAVA
STD_JAR_FILE( gid_File_Jar_Hsqldb, hsqldb )
STD_JAR_FILE( gid_File_Jar_Hsqldb_Sdbc, sdbc_hsqldb )
#endif
#ifdef SOLAR_JAVA
@ -1873,14 +1860,12 @@ File gid_File_Scripts_Beanshell
End
#ifdef SOLAR_JAVA
#ifndef GCJ
File gid_File_Scripts_Java
Dir = gid_Dir_Share_Scripts;
ARCHIVE_TXT_FILE_BODY;
Name = "ScriptsJava.zip";
End
#endif
#endif
File gid_File_Scripts_Javascript
Dir = gid_Dir_Share_Scripts;