mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-31 15:32:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add in xinput if X11 is set, not XVIDEO.

Browse Source
This commit is contained in:
Themaister 2012-09-25 13:58:43 +02:00
parent d732aa4c2e
commit fffd2fe504
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@ -164,7 +164,7 @@ ifeq ($(HAVE_SDL), 1)
# videocore's libs set later
endif
ifeq ($(HAVE_XVIDEO), 1)
ifeq ($(HAVE_X11), 1)
ifeq ($(HAVE_EGL), 1)
OBJ += gfx/context/xegl_ctx.o
DEFINES += $(EGL_CFLAGS)
@ -196,9 +196,15 @@ ifeq ($(HAVE_VIDEOCORE), 1)
endif
ifeq ($(HAVE_XVIDEO), 1)
OBJ += gfx/xvideo.o input/x11_input.o
LIBS += $(XVIDEO_LIBS) $(X11_LIBS) $(XEXT_LIBS)
DEFINES += $(XVIDEO_CFLAGS) $(X11_CFLAGS) $(XEXT_CFLAGS)
OBJ += gfx/xvideo.o
LIBS += $(XVIDEO_LIBS)
DEFINES += $(XVIDEO_CFLAGS)
endif
ifeq ($(HAVE_X11), 1)
OBJ += input/x11_input.o
LIBS += $(X11_LIBS) $(XEXT_LIBS)
DEFINES += $(X11_CFLAGS) $(XEXT_CFLAGS)
endif
ifeq ($(HAVE_CG), 1)