diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-08-30 13:58:15 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-08-30 14:00:32 +0100 |
| commit | aabc73d04a4c97272576edd4f73bde0cfa2392b2 (patch) | |
| tree | d85b9cf40871507b70e3fa7b3103948629a47927 /sd | |
| parent | f8182a1c53c2ccccbc77444d58ffb140b39ea798 (diff) | |
Do the same thing for gio as we do for dbus
and add -DENABLE_GIO to flags at build-time and an empty gb_LinkTarget__use_gio
when disabled.
Change-Id: I4adf0701a3d490cceecc00f6b81d6416a1e83088
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/Library_sd.mk | 5 | ||||
| -rw-r--r-- | sd/source/ui/remotecontrol/BluetoothServer.cxx | 6 |
2 files changed, 3 insertions, 8 deletions
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index 35d90026590f..e2c7191276aa 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -108,13 +108,8 @@ $(eval $(call gb_Library_use_libraries,sd,\ $(eval $(call gb_Library_use_externals,sd,\ libxml2 \ -)) - -ifeq ($(OS),LINUX) -$(eval $(call gb_Library_use_externals,sd,\ gio \ )) -endif ifeq ($(OS),WNT) $(eval $(call gb_Library_use_libraries,sd,\ diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx index a2de11ce351f..0fc4624e0de1 100644 --- a/sd/source/ui/remotecontrol/BluetoothServer.cxx +++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx @@ -9,7 +9,7 @@ #include "BluetoothServer.hxx" #include <stdio.h> -#ifdef LINUX +#if defined(LINUX) && defined(ENABLE_GIO) && defined(ENABLE_DBUS) #include <glib.h> #include <gio/gio.h> #include <sys/unistd.h> @@ -53,7 +53,7 @@ struct oslSocketImpl { void BluetoothServer::execute() { -#ifdef LINUX +#if defined(LINUX) && defined(ENABLE_GIO) && defined(ENABLE_DBUS) #ifdef GLIB_VERSION_2_26 g_type_init(); GError* aError = NULL; @@ -218,4 +218,4 @@ void BluetoothServer::setup( std::vector<Communicator*>* pCommunicators ) } -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |