From fffd2fe504665f2697b1bfd411f3c5f2dced5c67 Mon Sep 17 00:00:00 2001
From: Themaister <maister@archlinux.us>
Date: Tue, 25 Sep 2012 13:58:43 +0200
Subject: [PATCH] Add in xinput if X11 is set, not XVIDEO.
---
Makefile | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 4060c77936..4bcc6a055d 100644
--- a/Makefile
+++ b/Makefile
@@ -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)