From a8acea98b2c3509ebcfa4ff8716521a1128dc969 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 24 Sep 2015 14:16:57 +0200 Subject: [PATCH] Revert "Move enums to menu_input.c" This reverts commit 7a5f2228aa1ac49a10d2eb0937b7bb9aa72ca1fc. --- menu/menu_input.c | 4 ---- menu/menu_input.h | 12 ++++++++++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/menu/menu_input.c b/menu/menu_input.c index 844259bebe..27c9a6d9d5 100644 --- a/menu/menu_input.c +++ b/menu/menu_input.c @@ -39,10 +39,6 @@ #include "../input/input_remapping.h" #include "../input/input_common.h" -#define MENU_MAX_BUTTONS 219 -#define MENU_MAX_AXES 32 -#define MENU_MAX_HATS 4 - struct menu_bind_state_port { bool buttons[MENU_MAX_BUTTONS]; diff --git a/menu/menu_input.h b/menu/menu_input.h index 3baaaaa2be..9039aa51a6 100644 --- a/menu/menu_input.h +++ b/menu/menu_input.h @@ -26,6 +26,18 @@ typedef uint64_t retro_input_t; extern "C" { #endif +#ifndef MENU_MAX_BUTTONS +#define MENU_MAX_BUTTONS 219 +#endif + +#ifndef MENU_MAX_AXES +#define MENU_MAX_AXES 32 +#endif + +#ifndef MENU_MAX_HATS +#define MENU_MAX_HATS 4 +#endif + #ifndef MAX_USERS #define MAX_USERS 16 #endif