diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-02-09 22:31:30 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-02-13 16:49:24 +0200 |
| commit | 7edb4c739332432b11b5d31df9dc7bba3761f4f1 (patch) | |
| tree | 12deaafbd75c77a134f79e0d5df11b141c0d9c4e /solenv | |
| parent | 0caced5cd1cf537c6576ec6c147f40373b2eac6a (diff) | |
Add fw* and sfx to libmerged
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 6 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_defs.mk | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index e39e6f428cb0..ebd70a3462be 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -36,8 +36,14 @@ gb_MERGEDLIBS := \ drawinglayer \ editeng \ filterconfig \ + fwe \ + fwi \ + fwk \ + fwl \ + fwm \ lng \ package2 \ + sfx \ sofficeapp \ spl \ svx \ diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index f2bf866e7046..80ed26c8ebdf 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -107,6 +107,11 @@ gb_CFLAGS_WERROR := -Werror -DLIBO_WERROR gb_CXXFLAGS_WERROR := -Werror -DLIBO_WERROR endif +ifeq ($(MERGELIBS),TRUE) +gb_CFLAGS_COMMON += -DLIBO_MERGELIBS +gb_CXXFLAGS_COMMON += -DLIBO_MERGELIBS +endif + ifeq ($(ENABLE_LTO),TRUE) gb_Library_LTOFLAGS := -flto endif |