diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-02-07 14:15:29 +0000 |
---|---|---|
committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2014-02-14 14:18:08 +0100 |
commit | 2133096fab8dddb4305ea2673d2de15c78bd638d (patch) | |
tree | 0e01fab3d412ef61a47d00c4933888da34163c0f | |
parent | d17d9e4c31d1e648d7f28827e1320f9cf5108dc3 (diff) | |
download | telepathy-salut-2133096fab8dddb4305ea2673d2de15c78bd638d.tar.gz |
Add extensions to symbol-hacks
Because the test interface is the last thing in the extensions static
library, we have to add it to symbol-hacks.c so that it's visible to
the plugin. This wouldn't work on platforms where plugins can't have
undefined symbols, like Windows - we'd need something more like
Mission Control's mission-control-plugins or Gabble's libgabble-plugins
there - but it'll do for now.
-rw-r--r-- | src/symbol-hacks.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/symbol-hacks.c b/src/symbol-hacks.c index 4f0b089b..28744cac 100644 --- a/src/symbol-hacks.c +++ b/src/symbol-hacks.c @@ -1,11 +1,11 @@ /* This is pretty horrible. If we don't use a symbol in a wocky object * from its static library then libtool will not include said object * from the binary, so we can't use any symbols from that object in a - * plugin. + * plugin. The extensions/ static library has the same problem. * * This is a hack that X does. They can generate their file though as * they have an _X_EXPORT macro. This'll all disappear when Wocky - * becomes a shared library... + * becomes a shared library... except for the extensions/ bit. * * http://cgit.freedesktop.org/xorg/xserver/tree/hw/xfree86/loader/sdksyms.sh */ @@ -16,6 +16,8 @@ /* First include all the public headers. */ #include <wocky/wocky.h> +#include <extensions/extensions.h> + /* Reference one symbol from each of the above headers to include each * object in the final binary. */ static void *hacks[] = { @@ -62,6 +64,7 @@ static void *hacks[] = { wocky_xmpp_error_quark, wocky_xmpp_reader_get_type, wocky_xmpp_writer_get_type, + salut_svc_salut_plugin_test_get_type, NULL, }; |