diff options
author | sb <sb@openoffice.org> | 2010-01-20 16:17:12 +0100 |
---|---|---|
committer | sb <sb@openoffice.org> | 2010-01-20 16:17:12 +0100 |
commit | 1cac08caa6cab4ece70d89a4fb65f448e1271896 (patch) | |
tree | 4d553adb389da93c7a5e8dfc758403c0151e29bb /scp2/source | |
parent | 8638830a1c6ad735259754d611c55e37d44d6188 (diff) |
sb111: #i108477# wrongly resolved merge conflict had inadvertently dropped adabas and ado libraries from installation sets
Diffstat (limited to 'scp2/source')
-rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 0d00efe51e3a..e491fb72d672 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -36,6 +36,13 @@ File gid_File_Lib_Accessbridge Name = "java_uno_accessbridge.dll"; End #endif +#if ((defined(WNT)) || (defined(LINUX)) || ((defined(SOLARIS)) && (defined(SPARC)))|| defined(NETBSD) ) +STD_UNO_LIB_FILE( gid_File_Lib_Adabas, adabas) +#endif + +#if defined(WNT) +STD_UNO_LIB_FILE( gid_File_Lib_Ado, ado) +#endif STD_UNO_LIB_FILE( gid_File_Lib_Basctl, basctl) |