diff options
author | Tor Lillqvist <tml@iki.fi> | 2012-02-15 12:00:46 +0200 |
---|---|---|
committer | Tor Lillqvist <tml@iki.fi> | 2012-02-15 12:00:46 +0200 |
commit | c301199804f5beb7ef803abfa84e04d9351efb3f (patch) | |
tree | 991cfa7a033d7fc76e5ea76ca2a10363b1bc5271 /Library_merged.mk | |
parent | More String to rtl::OUString conversion while I'm at it. (diff) | |
parent | Need libfastsax.uno (diff) | |
download | core-c301199804f5beb7ef803abfa84e04d9351efb3f.tar.gz core-c301199804f5beb7ef803abfa84e04d9351efb3f.zip |
Merge branch 'feature/android'
Diffstat (limited to 'Library_merged.mk')
-rw-r--r-- | Library_merged.mk | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Library_merged.mk b/Library_merged.mk index 6d2d90806828..d4e31bbc7eb2 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -83,4 +83,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: |