encounter/SDL
1
0
Fork 0
mirror of https://github.com/encounter/SDL.git synced 2025-12-12 14:46:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed building using MinGW

Browse Source 
Our SDL_windows.h needed to be included before anything else so UNICODE is defined.
This commit is contained in:
Sam Lantinga
2013-10-17 23:02:29 -07:00
parent a2bd897064
commit 12ca3ce3fa
20 changed files with 62 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/joystick/windows/SDL_mmjoystick.c
View File

@@ -33,6 +33,11 @@
#include "../SDL_sysjoystick.h"
#include "../SDL_joystick_c.h"
#ifdef REGSTR_VAL_JOYOEMNAME
#undef REGSTR_VAL_JOYOEMNAME
#endif
#define REGSTR_VAL_JOYOEMNAME "OEMName"
#define MAX_JOYSTICKS 16
#define MAX_AXES 6 /* each joystick can have up to 6 axes */
#define MAX_BUTTONS 32 /* and 32 buttons */
@@ -45,7 +50,7 @@
/* array to hold joystick ID values */
static UINT SYS_JoystickID[MAX_JOYSTICKS];
static JOYCAPS SYS_Joystick[MAX_JOYSTICKS];
static JOYCAPSA SYS_Joystick[MAX_JOYSTICKS];
static char *SYS_JoystickName[MAX_JOYSTICKS];
/* The private structure used to keep track of a joystick */
@@ -148,7 +153,7 @@ SDL_SYS_JoystickInit(void)
int i;
int maxdevs;
JOYINFOEX joyinfo;
JOYCAPS joycaps;
JOYCAPSA joycaps;
MMRESULT result;
/* Reset the joystick ID & name mapping tables */
@@ -166,7 +171,7 @@ SDL_SYS_JoystickInit(void)
joyinfo.dwFlags = JOY_RETURNALL;
result = joyGetPosEx(i, &joyinfo);
if (result == JOYERR_NOERROR) {
result = joyGetDevCaps(i, &joycaps, sizeof(joycaps));
result = joyGetDevCapsA(i, &joycaps, sizeof(joycaps));
if (result == JOYERR_NOERROR) {
SYS_JoystickID[SDL_SYS_numjoysticks] = i;
SYS_Joystick[SDL_SYS_numjoysticks] = joycaps;