diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2011-08-24 12:17:31 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2011-08-24 14:23:43 +0100 |
| commit | 75fac9839793f73c9833489f1d70bf4136881cbf (patch) | |
| tree | 30c20c8b5924f84439e1b3b122cde6b8193831e6 /scp2 | |
| parent | 9ba447cec165946ed8b9e719c4a9ee318f9b051b (diff) | |
Add support for creating merged library.
This commit allows to set which libraries to merge
and creates merged library in tail_build if enabled.
This should save time when loading libraries in application
and also makes more sense for link-time optimization.
Signed-off-by: Michael Meeks <michael.meeks@novell.com>
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index f9376715c31b..975ec1598dbd 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1292,6 +1292,8 @@ STD_LIB_FILE( gid_File_Lib_Swui, swui) STD_LIB_FILE( gid_File_Lib_Msword, msword ) +STD_LIB_FILE( gid_File_Lib_Merged, merged ) + #if ! defined UNX File gid_File_Lib_Sysdtrans TXT_FILE_BODY; diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 1f79ee31a6a3..b718738776a4 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -253,6 +253,7 @@ Module gid_Module_Root_Files_4 gid_File_Lib_AVMediaWin, gid_File_Lib_AVMediaGStreamer, gid_File_Lib_BaseGfx, + gid_File_Lib_Merged, gid_File_Lib_Sysdtrans, gid_File_Lib_Sw, gid_File_Lib_TextConversionDlgs, |