mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-06 09:40:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ifdef the broken dbus code better.

Browse Source
This commit is contained in:
orbea 2017-12-16 05:16:27 -08:00
parent 6622cb0810
commit 1ddcc7be82
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.common
View File

@ -899,7 +899,6 @@ endif
ifeq ($(HAVE_X11), 1) ifeq ($(HAVE_X11), 1)
OBJ += input/common/input_x11_common.o \ OBJ += input/common/input_x11_common.o \
input/drivers/x11_input.o \ input/drivers/x11_input.o \
gfx/common/dbus_common.o \
gfx/common/x11_common.o \ gfx/common/x11_common.o \
gfx/common/xinerama_common.o gfx/common/xinerama_common.o
@ -927,6 +926,7 @@ endif
ifeq ($(HAVE_DBUS), 1) ifeq ($(HAVE_DBUS), 1)
LIBS += $(DBUS_LIBS) LIBS += $(DBUS_LIBS)
CFLAGS += $(DBUS_CFLAGS) CFLAGS += $(DBUS_CFLAGS)
OBJ += gfx/common/dbus_common.o
endif endif
ifeq ($(HAVE_UDEV), 1) ifeq ($(HAVE_UDEV), 1)

4
gfx/common/x11_common.c
View File

@ -40,7 +40,9 @@
#include <encodings/utf.h> #include <encodings/utf.h>
#ifdef HAVE_DBUS
#include "dbus_common.h" #include "dbus_common.h"
#endif
#include "../../frontend/frontend_driver.h" #include "../../frontend/frontend_driver.h"
#include "../../input/input_driver.h" #include "../../input/input_driver.h"
@ -604,7 +606,9 @@ bool x11_connect(void)
return false; return false;
} }
#ifdef HAVE_DBUS
dbus_ensure_connection(); dbus_ensure_connection();
#endif
return true; return true;
} }

5
griffin/griffin.c
View File

@ -251,9 +251,12 @@ VIDEO CONTEXT
#if defined(HAVE_X11) #if defined(HAVE_X11)
#include "../gfx/common/x11_common.c" #include "../gfx/common/x11_common.c"
#include "../gfx/common/dbus_common.c"
#include "../gfx/common/xinerama_common.c" #include "../gfx/common/xinerama_common.c"
#ifdef HAVE_DBUS
#include "../gfx/common/dbus_common.c"
#endif
#ifndef HAVE_OPENGLES #ifndef HAVE_OPENGLES
#include "../gfx/drivers_context/x_ctx.c" #include "../gfx/drivers_context/x_ctx.c"
#endif #endif

2
qb/config.params.sh
View File

@ -18,7 +18,7 @@ HAVE_SDL2=auto # SDL2 support (disables SDL 1.x)
C89_SDL2=no C89_SDL2=no
HAVE_LIBUSB=auto # Libusb HID support HAVE_LIBUSB=auto # Libusb HID support
C89_LIBUSB=no C89_LIBUSB=no
HAVE_DBUS=auto # dbus support HAVE_DBUS=no # dbus support
HAVE_SYSTEMD=auto # Systemd support HAVE_SYSTEMD=auto # Systemd support
HAVE_UDEV=auto # Udev/Evdev gamepad support HAVE_UDEV=auto # Udev/Evdev gamepad support
HAVE_THREADS=auto # Threading support HAVE_THREADS=auto # Threading support