diff options
| -rw-r--r-- | RepositoryExternal.mk | 13 | ||||
| -rw-r--r-- | sd/Library_sd.mk | 5 | ||||
| -rw-r--r-- | sd/source/ui/remotecontrol/BluetoothServer.cxx | 6 | ||||
| -rw-r--r-- | sfx2/Library_qstart.mk | 1 |
4 files changed, 17 insertions, 8 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 96709fb8ef70..8401164ee2a6 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1117,6 +1117,7 @@ endef endif # SYSTEM_LPSOLVE +ifeq ($(ENABLE_GIO),TRUE) define gb_LinkTarget__use_gio $(call gb_LinkTarget_set_include,$(1),\ @@ -1124,10 +1125,22 @@ $(call gb_LinkTarget_set_include,$(1),\ $(GIO_CFLAGS) \ ) +$(call gb_LinkTarget_add_defs,$(1),\ + -DENABLE_GIO \ +) + $(call gb_LinkTarget_add_libs,$(1),$(GIO_LIBS)) endef +else # ENABLE_GIO + +define gb_LinkTarget__use_gio + +endef + +endif # ENABLE_GIO + define gb_LinkTarget__use_gtk $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ 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: */ diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk index 84d4e5d9e062..ccd254c889f5 100644 --- a/sfx2/Library_qstart.mk +++ b/sfx2/Library_qstart.mk @@ -56,6 +56,7 @@ $(eval $(call gb_Library_use_libraries,qstart_gtk,\ )) $(eval $(call gb_Library_use_externals,qstart_gtk,\ + gio \ gtk \ libxml2 \ )) |