diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-02-09 22:31:30 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-02-13 17:53:36 +0200 |
| commit | 25f8330004409edf8007df0cc80ef540c03d18da (patch) | |
| tree | cd57dc9c10abd268628a226f2cbaaf8479266a9c /solenv | |
| parent | a092057d2b8ff8abd1172b4163979ecf799d5888 (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/WNT_INTEL_MSC.mk | 5 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_defs.mk | 5 |
3 files changed, 16 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/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index c10684590991..d542017b4092 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -191,6 +191,11 @@ gb_CFLAGS_WERROR := -WX -DLIBO_WERROR gb_CXXFLAGS_WERROR := -WX -DLIBO_WERROR endif +ifeq ($(MERGELIBS),TRUE) +gb_CFLAGS += -DLIBO_MERGELIBS +gb_CXXFLAGS += -DLIBO_MERGELIBS +endif + gb_LinkTarget_EXCEPTIONFLAGS := \ -DEXCEPTIONS_ON \ -EHa \ 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 |