From f3a0e58bd99a0ecde883e66581c8323bfdf6914d Mon Sep 17 00:00:00 2001 From: Mike Robinson Date: Sat, 4 Oct 2014 22:04:38 +0100 Subject: [PATCH] Add HAVE_PARPORT build option --- Makefile.common | 8 ++++++-- input/input_common.c | 2 ++ qb/config.libs.sh | 5 ++++- qb/config.params.sh | 1 + 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Makefile.common b/Makefile.common index bbea4f8b3a..825291691d 100644 --- a/Makefile.common +++ b/Makefile.common @@ -59,8 +59,8 @@ endif ifneq ($(findstring Linux,$(OS)),) LIBS += -lrt JOYCONFIG_LIBS += -lrt - OBJ += input/linuxraw_input.o input/linuxraw_joypad.o input/parport_joypad.o - JOYCONFIG_OBJ += tools/linuxraw_joypad.o tools/parport_joypad.o + OBJ += input/linuxraw_input.o input/linuxraw_joypad.o + JOYCONFIG_OBJ += tools/linuxraw_joypad.o endif ifeq ($(findstring Haiku,$(OS)),) @@ -336,6 +336,10 @@ ifeq ($(HAVE_UDEV), 1) JOYCONFIG_OBJ += tools/udev_joypad.o endif +ifeq ($(HAVE_PARPORT), 1) + OBJ += input/parport_joypad.o + JOYCONFIG_OBJ += tools/parport_joypad.o +endif # Video # diff --git a/input/input_common.c b/input/input_common.c index 6ccb262395..97a3b3c36b 100644 --- a/input/input_common.c +++ b/input/input_common.c @@ -75,6 +75,8 @@ rarch_joypad_driver_t *joypad_drivers[] = { #endif #if defined(__linux) && !defined(ANDROID) &linuxraw_joypad, +#endif +#ifdef HAVE_PARPORT &parport_joypad, #endif #ifdef ANDROID diff --git a/qb/config.libs.sh b/qb/config.libs.sh index 6f58ad53d8..f84a3aaddf 100644 --- a/qb/config.libs.sh +++ b/qb/config.libs.sh @@ -324,6 +324,9 @@ if [ "$HAVE_UDEV" != "no" ]; then fi fi +check_header PARPORT linux/parport.h +check_header PARPORT linux/ppdev.h + check_lib STRL "$CLIB" strlcpy check_lib STRCASESTR "$CLIB" strcasestr check_lib MMAP "$CLIB" mmap @@ -336,6 +339,6 @@ add_define_make OS "$OS" # Creates config.mk and config.h. add_define_make GLOBAL_CONFIG_DIR "$GLOBAL_CONFIG_DIR" -VARS="RGUI LAKKA GLUI ALSA OSS OSS_BSD OSS_LIB AL RSOUND ROAR JACK COREAUDIO PULSE SDL SDL2 D3D9 DINPUT WINXINPUT DSOUND XAUDIO OPENGL LIMA OMAP GLES GLES3 VG EGL KMS GBM DRM DYLIB GETOPT_LONG THREADS CG LIBXML2 ZLIB DYNAMIC FFMPEG AVCODEC AVFORMAT AVUTIL SWSCALE FREETYPE XKBCOMMON XVIDEO X11 XEXT XF86VM XINERAMA WAYLAND MALI_FBDEV VIVANTE_FBDEV NETPLAY NETWORK_CMD STDIN_CMD COMMAND SOCKET_LEGACY FBO STRL STRCASESTR MMAP PYTHON FFMPEG_ALLOC_CONTEXT3 FFMPEG_AVCODEC_OPEN2 FFMPEG_AVIO_OPEN FFMPEG_AVFORMAT_WRITE_HEADER FFMPEG_AVFORMAT_NEW_STREAM FFMPEG_AVCODEC_ENCODE_AUDIO2 FFMPEG_AVCODEC_ENCODE_VIDEO2 BSV_MOVIE VIDEOCORE NEON FLOATHARD FLOATSOFTFP UDEV V4L2 AV_CHANNEL_LAYOUT 7ZIP" +VARS="RGUI LAKKA GLUI ALSA OSS OSS_BSD OSS_LIB AL RSOUND ROAR JACK COREAUDIO PULSE SDL SDL2 D3D9 DINPUT WINXINPUT DSOUND XAUDIO OPENGL LIMA OMAP GLES GLES3 VG EGL KMS GBM DRM DYLIB GETOPT_LONG THREADS CG LIBXML2 ZLIB DYNAMIC FFMPEG AVCODEC AVFORMAT AVUTIL SWSCALE FREETYPE XKBCOMMON XVIDEO X11 XEXT XF86VM XINERAMA WAYLAND MALI_FBDEV VIVANTE_FBDEV NETPLAY NETWORK_CMD STDIN_CMD COMMAND SOCKET_LEGACY FBO STRL STRCASESTR MMAP PYTHON FFMPEG_ALLOC_CONTEXT3 FFMPEG_AVCODEC_OPEN2 FFMPEG_AVIO_OPEN FFMPEG_AVFORMAT_WRITE_HEADER FFMPEG_AVFORMAT_NEW_STREAM FFMPEG_AVCODEC_ENCODE_AUDIO2 FFMPEG_AVCODEC_ENCODE_VIDEO2 BSV_MOVIE VIDEOCORE NEON FLOATHARD FLOATSOFTFP UDEV V4L2 AV_CHANNEL_LAYOUT 7ZIP PARPORT" create_config_make config.mk $VARS create_config_header config.h $VARS diff --git a/qb/config.params.sh b/qb/config.params.sh index 523da197d2..897b3173c8 100644 --- a/qb/config.params.sh +++ b/qb/config.params.sh @@ -47,3 +47,4 @@ HAVE_FLOATHARD=no # Force hard float ABI (for ARM) HAVE_FLOATSOFTFP=no # Force soft float ABI (for ARM) HAVE_7ZIP=yes # Compile in 7z support HAVE_PRESERVE_DYLIB=no # Disable dlclose() for Valgrind support +HAVE_PARPORT=auto # Parallel port joypad support