mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-30 07:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move defines around

Browse Source
This commit is contained in:
twinaphex 2015-09-24 21:23:16 +02:00
parent df23b122fe
commit 8a6333ddc1
4 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
input/input_driver.h
View File

@ -29,6 +29,10 @@
#include "input_overlay.h" #include "input_overlay.h"
#endif #endif
#ifndef MAX_USERS
#define MAX_USERS 16
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif

1
menu/menu.h
View File

@ -25,6 +25,7 @@
#include <boolean.h> #include <boolean.h>
#include "../driver.h" #include "../driver.h"
#include "../input/input_driver.h"
#include "../dynamic.h" #include "../dynamic.h"
#if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL) #if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL)

4
menu/menu_input.c
View File

@ -39,6 +39,10 @@
#include "../input/input_remapping.h" #include "../input/input_remapping.h"
#include "../input/input_common.h" #include "../input/input_common.h"
#define MENU_MAX_BUTTONS 219
#define MENU_MAX_AXES 32
#define MENU_MAX_HATS 4
unsigned bind_port; unsigned bind_port;
struct menu_bind_state_port struct menu_bind_state_port

18
menu/menu_input.h
View File

@ -25,22 +25,6 @@
extern "C" { extern "C" {
#endif #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
typedef enum menu_action typedef enum menu_action
{ {
MENU_ACTION_UP, MENU_ACTION_UP,
@ -86,7 +70,7 @@ enum menu_ctl_state
MENU_CTL_POINTER_DRAGGING, MENU_CTL_POINTER_DRAGGING,
MENU_CTL_KEYBOARD_DISPLAY, MENU_CTL_KEYBOARD_DISPLAY,
MENU_CTL_KEYBOARD_BUFF_PTR, MENU_CTL_KEYBOARD_BUFF_PTR,
MENU_CTL_KEYBOARD_LABEL, MENU_CTL_KEYBOARD_LABEL
}; };
enum mouse_action enum mouse_action