diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2012-09-18 11:23:52 +0200 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2012-09-18 14:17:27 +0000 |
| commit | 903065dda1e574f4791ff40c31e39f14ba710424 (patch) | |
| tree | 1a8e0724031a3747465d61ae0b7e7c927b2e1292 /scp2 | |
| parent | b8a331fefc6332baa62144095d3f26cdb456d2c7 (diff) | |
switch build system to mork driver implementation
On all non windows platforms no mozilla is used any more.
On windows it used for O and OE address book access.
Once alternative implementation for it exists,
mozilla can be stripped there too.
Change-Id: I54144005e6a284326b45a34eb958d170e872471e
Reviewed-on: https://gerrit.libreoffice.org/637
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 8 | ||||
| -rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 4 |
2 files changed, 12 insertions, 0 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 8a20d0735632..2ee2f0bcc490 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -890,6 +890,8 @@ File gid_File_Lib_Mcnttype #endif End +#if defined(WNT) + #if !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA) && !defined(MACOSX) // #i91209# STD_LIB_FILE(gid_File_Lib_Mozab,mozab2) @@ -910,6 +912,12 @@ End #endif +#else + +STD_LIB_FILE(gid_File_Lib_Mork,mork) + +#endif + STD_LIB_FILE(gid_File_Lib_WpftWriter,wpftwriter) STD_LIB_FILE(gid_File_Lib_T602Filter,t602filter) diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index aa4ff72b2583..c265fd9693e8 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -379,9 +379,13 @@ Module gid_Module_Root_Files_5 gid_File_Lib_Hsqldb_2, gid_File_Lib_Jdbc, gid_File_Lib_Mcnttype, +#if defined(WNT) gid_File_Lib_Mozab_2, gid_File_Lib_Mozabdrv, gid_File_Lib_Mozbootstrap, +#else + gid_File_Lib_Mork, +#endif gid_File_Lib_Mysql, gid_File_Lib_Odbc, gid_File_Lib_Officebean, |