From 0067710c65c88983a55ce08deecbac2bc718f6a4 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Mon, 30 Jul 2012 01:10:36 +0200 Subject: [PATCH] (RARCH_CONSOLE) Only compile in rarch_console_input.c if HAVE_DEFAULT_RETROPAD_INPUT is defined --- console/griffin/griffin.c | 2 ++ console/rarch_console_input.c | 4 ---- console/rarch_console_input.h | 2 -- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/console/griffin/griffin.c b/console/griffin/griffin.c index 643949ce93..f04e599365 100644 --- a/console/griffin/griffin.c +++ b/console/griffin/griffin.c @@ -44,7 +44,9 @@ CONSOLE EXTENSIONS #include "../rarch_console_config.c" #endif +#ifdef HAVE_DEFAULT_RETROPAD_INPUT #include "../rarch_console_input.c" +#endif #ifdef HAVE_ZLIB #include "../rarch_console_rzlib.c" diff --git a/console/rarch_console_input.c b/console/rarch_console_input.c index a93a1bfb38..3bf49e2698 100644 --- a/console/rarch_console_input.c +++ b/console/rarch_console_input.c @@ -49,8 +49,6 @@ char rarch_default_libretro_keybind_name_lut[RARCH_FIRST_META_KEY][256] = { "RetroPad Button R3", /* RETRO_DEVICE_ID_JOYPAD_R3 */ }; -#ifdef HAVE_DEFAULT_RETROPAD_INPUT - extern const struct platform_bind platform_keys[]; extern const unsigned int platform_keys_size; @@ -150,5 +148,3 @@ const char *rarch_input_get_default_keybind_name(unsigned id) { return rarch_default_libretro_keybind_name_lut[id]; } - -#endif diff --git a/console/rarch_console_input.h b/console/rarch_console_input.h index ee77ea1ae4..0eb8fde5e7 100644 --- a/console/rarch_console_input.h +++ b/console/rarch_console_input.h @@ -37,7 +37,6 @@ enum extern uint64_t rarch_default_keybind_lut[RARCH_FIRST_META_KEY]; extern char rarch_default_libretro_keybind_name_lut[RARCH_FIRST_META_KEY][256]; -#ifdef HAVE_DEFAULT_RETROPAD_INPUT const char *rarch_input_find_platform_key_label(uint64_t joykey); void rarch_input_set_default_keybinds(unsigned player); @@ -46,6 +45,5 @@ void rarch_input_set_keybind(unsigned player, unsigned keybind_action, uint64_t void rarch_input_set_controls_default (const input_driver_t *input); const char *rarch_input_get_default_keybind_name (unsigned id); -#endif #endif