diff options
| author | Rene Engelhard <rene@debian.org> | 2012-09-18 13:19:57 +0200 |
|---|---|---|
| committer | Rene Engelhard <rene@debian.org> | 2012-09-18 16:21:45 +0200 |
| commit | 85dbc8129887fb94370afcb587e2a9264cb2ed10 (patch) | |
| tree | bc61755fe67411929586c853a65cfe8588d3aff6 /sd | |
| parent | 8c5cd962353dd9ce8234211a66547eb057202eb5 (diff) | |
add --with-system-bluez and alöllow disabling of sdremote
Change-Id: I1b0dbc8e8efa7535bdc699e343e31594af00d553
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/Library_sd.mk | 23 | ||||
| -rw-r--r-- | sd/prj/build.lst | 2 | ||||
| -rw-r--r-- | sd/source/ui/remotecontrol/BluetoothServer.cxx | 10 |
3 files changed, 20 insertions, 15 deletions
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index 876954eebeae..953507ab9b94 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -329,15 +329,6 @@ $(eval $(call gb_Library_add_exception_objects,sd,\ sd/source/ui/presenter/PresenterPreviewCache \ sd/source/ui/presenter/PresenterTextView \ sd/source/ui/presenter/SlideRenderer \ - sd/source/ui/remotecontrol/BluetoothServer \ - sd/source/ui/remotecontrol/BufferedStreamSocket \ - sd/source/ui/remotecontrol/Communicator \ - sd/source/ui/remotecontrol/DiscoveryService \ - sd/source/ui/remotecontrol/ImagePreparer \ - sd/source/ui/remotecontrol/Server \ - sd/source/ui/remotecontrol/Receiver \ - sd/source/ui/remotecontrol/Listener \ - sd/source/ui/remotecontrol/Transmitter \ sd/source/ui/slideshow/PaneHider \ sd/source/ui/slideshow/SlideShowRestarter \ sd/source/ui/slideshow/showwin \ @@ -522,6 +513,20 @@ $(eval $(call gb_Library_add_exception_objects,sd,\ sd/source/ui/view/zoomlist \ )) +ifeq ($(ENABLE_SDREMOTE),YES) +$(eval $(call gb_Library_add_exception_objects,sd,\ + sd/source/ui/remotecontrol/BluetoothServer \ + sd/source/ui/remotecontrol/BufferedStreamSocket \ + sd/source/ui/remotecontrol/Communicator \ + sd/source/ui/remotecontrol/DiscoveryService \ + sd/source/ui/remotecontrol/ImagePreparer \ + sd/source/ui/remotecontrol/Server \ + sd/source/ui/remotecontrol/Receiver \ + sd/source/ui/remotecontrol/Listener \ + sd/source/ui/remotecontrol/Transmitter \ +)) +endif + ifeq ($(strip $(GUI)),WNT) $(eval $(call gb_Library_add_cxxobjects,sd,\ sd/source/ui/app/optsitem \ diff --git a/sd/prj/build.lst b/sd/prj/build.lst index b4dc93da6e47..b340431f8e2f 100644 --- a/sd/prj/build.lst +++ b/sd/prj/build.lst @@ -1,3 +1,3 @@ -sd sd : filter TRANSLATIONS:translations animations configmgr svx sfx2 stoc canvas embeddedobj LIBXSLT:libxslt oox ure test xmloff fileaccess unoxml dbaccess NULL +sd sd : filter TRANSLATIONS:translations animations configmgr svx sfx2 stoc canvas embeddedobj LIBXSLT:libxslt oox ure test xmloff fileaccess unoxml dbaccess BLUEZ:bluez_bluetooth NULL sd sd usr1 - all sd_mkout NULL sd sd\prj nmake - all sd_prj NULL diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx index 10dee39fe36e..2e06322baf27 100644 --- a/sd/source/ui/remotecontrol/BluetoothServer.cxx +++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx @@ -9,13 +9,13 @@ #include "BluetoothServer.hxx" #include <stdio.h> -#if defined(LINUX) && defined(ENABLE_DBUS) +#if (defined(LINUX) && !defined(__FreeBSD_kernel__)) && defined(ENABLE_DBUS) #include <glib.h> #include <dbus/dbus-glib.h> #include <sys/unistd.h> #include <sys/socket.h> -#include "bluetooth/bluetooth.h" -#include "bluetooth/rfcomm.h" +#include <bluetooth/bluetooth.h> +#include <bluetooth/rfcomm.h> #endif #ifdef WIN32 @@ -51,7 +51,7 @@ bool BluetoothServer::isDiscoverable() void BluetoothServer::execute() { -#if defined(LINUX) && defined(ENABLE_DBUS) +#if (defined(LINUX) && !defined(__FreeBSD_kernel__)) && defined(ENABLE_DBUS) g_type_init(); @@ -252,7 +252,7 @@ void BluetoothServer::execute() } // WIN32 -#else // !(defined(LINUX) && defined(ENABLE_DBUS)) && !defined(WIN32) +#else // !((defined(LINUX) && !defined(__FreeBSD_kernel__)) && defined(ENABLE_DBUS)) && !defined(WIN32) (void) mpCommunicators; // avoid warnings about unused member #endif } |