From 76c7f13f8c23f65b871f3122cc8e5a21e6c68467 Mon Sep 17 00:00:00 2001 From: Themaister Date: Fri, 3 Jan 2014 20:18:50 +0100 Subject: [PATCH] Add INPUT_UDEV string to get_default_input_driver. --- config.def.h | 6 +++--- settings.c | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/config.def.h b/config.def.h index 00764cc9ea..b700d18d1b 100644 --- a/config.def.h +++ b/config.def.h @@ -175,8 +175,6 @@ enum #define INPUT_DEFAULT_DRIVER INPUT_DINPUT #elif defined(EMSCRIPTEN) #define INPUT_DEFAULT_DRIVER INPUT_RWEBINPUT -#elif defined(HAVE_SDL) -#define INPUT_DEFAULT_DRIVER INPUT_SDL #elif defined(__CELLOS_LV2__) #define INPUT_DEFAULT_DRIVER INPUT_PS3 #elif defined(SN_TARGET_PSP2) || defined(PSP) @@ -185,7 +183,7 @@ enum #define INPUT_DEFAULT_DRIVER INPUT_WII #elif defined(HAVE_UDEV) #define INPUT_DEFAULT_DRIVER INPUT_UDEV -#elif defined(PANDORA) || defined(HAVE_VIDEOCORE) +#elif defined(__linux__) && !defined(ANDROID) #define INPUT_DEFAULT_DRIVER INPUT_LINUXRAW #elif defined(HAVE_X11) #define INPUT_DEFAULT_DRIVER INPUT_X @@ -193,6 +191,8 @@ enum #define INPUT_DEFAULT_DRIVER INPUT_APPLE #elif defined(__BLACKBERRY_QNX__) #define INPUT_DEFAULT_DRIVER INPUT_QNX +#elif defined(HAVE_SDL) +#define INPUT_DEFAULT_DRIVER INPUT_SDL #else #define INPUT_DEFAULT_DRIVER INPUT_NULL #endif diff --git a/settings.c b/settings.c index 81334b4abf..007e0b82dd 100644 --- a/settings.c +++ b/settings.c @@ -135,6 +135,8 @@ const char *config_get_default_input(void) return "gx"; case INPUT_LINUXRAW: return "linuxraw"; + case INPUT_UDEV: + return "udev"; case INPUT_APPLE: return "apple_input"; case INPUT_QNX: