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 /Library_merged.mk | |
| parent | 0caced5cd1cf537c6576ec6c147f40373b2eac6a (diff) | |
Add fw* and sfx to libmerged
Diffstat (limited to 'Library_merged.mk')
| -rw-r--r-- | Library_merged.mk | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Library_merged.mk b/Library_merged.mk index b2e49b067d96..ac55cdc2e9f4 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -28,14 +28,12 @@ $(eval $(call gb_Library_add_linked_libs,merged,\ comphelper \ cppu \ cppuhelper \ - fwe \ i18nisolang1 \ i18npaper \ sal \ salhelper \ sax \ sb \ - sfx \ sot \ svl \ svt \ @@ -50,6 +48,7 @@ $(eval $(call gb_Library_add_linked_libs,merged,\ $(eval $(call gb_Library_use_externals,merged,\ icuuc \ + libxml2 \ zlib \ )) @@ -76,4 +75,11 @@ $(eval $(call gb_Library_add_linked_libs,merged,\ )) endif +ifeq ($(OS),MACOSX) +$(eval $(call gb_Library_add_linked_libs,merged,\ + objc \ + Cocoa \ +)) +endif + # vim: set noet sw=4 ts=4: |