diff options
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | input/Makefile | 9 | ||||
| -rw-r--r-- | input/joystick.c | 4 | ||||
| -rw-r--r-- | input/lirc.c | 4 |
4 files changed, 10 insertions, 9 deletions
@@ -7428,6 +7428,8 @@ SGIAUDIO_LIB = $_ld_sgiaudio # input/demuxer/codecs TERMCAP_LIB = $_ld_termcap +JOYSTICK = $_joystick +LIRC = $_lirc LIRC_LIB = $_ld_lirc LIRCC_LIB = $_ld_lircc TV = $_tv diff --git a/input/Makefile b/input/Makefile index dcd64df93f..f829b883bf 100644 --- a/input/Makefile +++ b/input/Makefile @@ -3,7 +3,14 @@ include ../config.mak LIBNAME = libinput.a -SRCS=input.c joystick.c lirc.c +SRCS=input.c +ifeq ($(JOYSTICK),yes) +SRCS += joystick.c +endif +ifeq ($(LIRC),yes) +SRCS += lirc.c +endif + OBJS=$(SRCS:.c=.o) CFLAGS = -I. -I.. $(OPTFLAGS) diff --git a/input/joystick.c b/input/joystick.c index d9d807b60f..cd77dd42d5 100644 --- a/input/joystick.c +++ b/input/joystick.c @@ -1,8 +1,6 @@ #include "config.h" -#ifdef HAVE_JOYSTICK - #include "joystick.h" #include "input.h" @@ -163,5 +161,3 @@ int mp_input_joystick_read(int fd) { } #endif - -#endif diff --git a/input/lirc.c b/input/lirc.c index 411561bc52..9694e64367 100644 --- a/input/lirc.c +++ b/input/lirc.c @@ -1,8 +1,6 @@ #include "config.h" -#ifdef HAVE_LIRC - #include <lirc/lirc_client.h> #include <errno.h> #include <stdio.h> @@ -115,5 +113,3 @@ mp_input_lirc_close(int fd) { lirc_freeconfig(lirc_config); lirc_deinit(); } - -#endif |