mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 06:44:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add HAVE_LIBUI define

Browse Source
This commit is contained in:
Rob Loach 2017-08-12 18:43:16 -04:00
parent ae5535c425
commit f4283f6de0
No known key found for this signature in database
GPG Key ID: 627C60834A74A21A
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.common
View File

@ -380,6 +380,7 @@ OBJ += $(OBJS_TLS_CRYPTO) $(OBJS_TLS_X509) $(OBJS_TLS)
endif endif
ifeq ($(HAVE_LIBUI), 1) ifeq ($(HAVE_LIBUI), 1)
DEFINES += -DHAVE_LIBUI
ifeq ($(HAVE_GTKPLUS), 1) ifeq ($(HAVE_GTKPLUS), 1)
CFLAGS += -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 CFLAGS += -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0
LIBS += -lgtk-3 -lgdk-3 -lpangocairo-1.0 -lpango-1.0 -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0 LIBS += -lgtk-3 -lgdk-3 -lpangocairo-1.0 -lpango-1.0 -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0

2
command.c
View File

@ -2605,7 +2605,7 @@ bool command_event(enum event_command cmd, void *data)
command_event_restore_default_shader_preset(); command_event_restore_default_shader_preset();
break; break;
case CMD_EVENT_LIBUI_TEST: case CMD_EVENT_LIBUI_TEST:
#if 1 #if HAVE_LIBUI
libui_main(); libui_main();
#endif #endif
break; break;

6
retroarch.c
View File

@ -2424,10 +2424,10 @@ static enum runloop_state runloop_check_state(
current_input, RARCH_GRAB_MOUSE_TOGGLE); current_input, RARCH_GRAB_MOUSE_TOGGLE);
if (pressed && !old_pressed) if (pressed && !old_pressed)
#if 0 #if HAVE_LIBUI
command_event(CMD_EVENT_GRAB_MOUSE_TOGGLE, NULL);
#else
command_event(CMD_EVENT_LIBUI_TEST, NULL); command_event(CMD_EVENT_LIBUI_TEST, NULL);
#else
command_event(CMD_EVENT_GRAB_MOUSE_TOGGLE, NULL);
#endif #endif
old_pressed = pressed; old_pressed = pressed;