pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Almost got this compiling on Cygwin32, just needs DirectInput 7

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403217
This commit is contained in:
Sam Lantinga 2008-09-15 08:41:03 +00:00
parent 809f6ba3b4
commit 7792866ddb
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/haptic/win32/SDL_syshaptic.c
View file

@ -154,7 +154,7 @@ SDL_SYS_HapticInit(void)
} }
ret = CoCreateInstance(&CLSID_DirectInput, NULL, CLSCTX_INPROC_SERVER, ret = CoCreateInstance(&CLSID_DirectInput, NULL, CLSCTX_INPROC_SERVER,
&IID_IDirectInput, &dinput); &IID_IDirectInput, (LPVOID)&dinput);
if (FAILED(ret)) { if (FAILED(ret)) {
DI_SetError("CoCreateInstance", ret); DI_SetError("CoCreateInstance", ret);
return -1; return -1;

7
src/joystick/win32/SDL_dxjoystick.c
View file

@ -41,6 +41,11 @@
#include "SDL_dxjoystick_c.h" #include "SDL_dxjoystick_c.h"
#ifndef DIDFT_OPTIONAL
#define DIDFT_OPTIONAL 0x80000000
#endif
#define INPUT_QSIZE 32 /* Buffer up to 32 input messages */ #define INPUT_QSIZE 32 /* Buffer up to 32 input messages */
#define MAX_JOYSTICKS 8 #define MAX_JOYSTICKS 8
#define AXIS_MIN -32768 /* minimum value for axis coordinate */ #define AXIS_MIN -32768 /* minimum value for axis coordinate */
@ -285,7 +290,7 @@ SDL_SYS_JoystickInit(void)
} }
result = CoCreateInstance(&CLSID_DirectInput, NULL, CLSCTX_INPROC_SERVER, result = CoCreateInstance(&CLSID_DirectInput, NULL, CLSCTX_INPROC_SERVER,
&IID_IDirectInput, &dinput); &IID_IDirectInput, (LPVOID)&dinput);
if (FAILED(result)) { if (FAILED(result)) {
SetDIerror("CoCreateInstance", result); SetDIerror("CoCreateInstance", result);