diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-05-22 17:42:59 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-07-17 16:40:10 +0200 |
| commit | bfb7015446053b18c0e683ce7a943a519959dd80 (patch) | |
| tree | dd1c91a0fa2af7bc9e8a127f807150e92de2c23f /sc/Library_sc.mk | |
| parent | b1de503a677dfe3b4306ad0a0b80a19ceaaea496 (diff) | |
tubes: cleanup abstraction, and add in-process demo mode
Pass const rtl::OUString &s around instead of random pointers.
Allow sc/ to build and work without telepathy enabled.
Add aforementioned demo mode hack.
Diffstat (limited to 'sc/Library_sc.mk')
| -rw-r--r-- | sc/Library_sc.mk | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk index 551ad07df564..09ddcce9c83a 100644 --- a/sc/Library_sc.mk +++ b/sc/Library_sc.mk @@ -48,10 +48,25 @@ $(eval $(call gb_Library_add_linked_libs,sc,\ tubes \ )) +$(eval $(call gb_Library_add_cxxflags,sc,\ + $$(TELEPATHY_CFLAGS) \ + -DENABLE_TELEPATHY \ +)) + +$(eval $(call gb_Library_add_libs,sc,\ + $$(TELEPATHY_LIBS) \ +)) + $(eval $(call gb_Library_use_externals,sc,\ telepathy \ )) +$(eval $(call gb_Library_add_exception_objects,sc,\ + sc/source/ui/collab/collab \ + sc/source/ui/collab/contacts \ + sc/source/ui/collab/sendfunc \ +)) + endif $(eval $(call gb_Library_use_libraries,sc,\ @@ -328,9 +343,6 @@ $(eval $(call gb_Library_add_exception_objects,sc,\ sc/source/ui/cctrl/popmenu \ sc/source/ui/cctrl/tbinsert \ sc/source/ui/cctrl/tbzoomsliderctrl \ - sc/source/ui/collab/collab \ - sc/source/ui/collab/contacts \ - sc/source/ui/collab/sendfunc \ sc/source/ui/dbgui/asciiopt \ sc/source/ui/dbgui/consdlg \ sc/source/ui/dbgui/csvcontrol \ |