# HG changeset patch # User Sam Lantinga # Date 1221468063 0 # Node ID 0c544c2eff77332fa1f31fc19e005a1acdee7c4d # Parent 02aa80d7905f6ab93f25bc519cd08af92a4dda43 Almost got this compiling on Cygwin32, just needs DirectInput 7 diff -r 02aa80d7905f -r 0c544c2eff77 src/haptic/win32/SDL_syshaptic.c --- a/src/haptic/win32/SDL_syshaptic.c Mon Sep 15 07:34:36 2008 +0000 +++ b/src/haptic/win32/SDL_syshaptic.c Mon Sep 15 08:41:03 2008 +0000 @@ -154,7 +154,7 @@ } ret = CoCreateInstance(&CLSID_DirectInput, NULL, CLSCTX_INPROC_SERVER, - &IID_IDirectInput, &dinput); + &IID_IDirectInput, (LPVOID)&dinput); if (FAILED(ret)) { DI_SetError("CoCreateInstance", ret); return -1; diff -r 02aa80d7905f -r 0c544c2eff77 src/joystick/win32/SDL_dxjoystick.c --- a/src/joystick/win32/SDL_dxjoystick.c Mon Sep 15 07:34:36 2008 +0000 +++ b/src/joystick/win32/SDL_dxjoystick.c Mon Sep 15 08:41:03 2008 +0000 @@ -41,6 +41,11 @@ #include "SDL_dxjoystick_c.h" +#ifndef DIDFT_OPTIONAL +#define DIDFT_OPTIONAL 0x80000000 +#endif + + #define INPUT_QSIZE 32 /* Buffer up to 32 input messages */ #define MAX_JOYSTICKS 8 #define AXIS_MIN -32768 /* minimum value for axis coordinate */ @@ -285,7 +290,7 @@ } result = CoCreateInstance(&CLSID_DirectInput, NULL, CLSCTX_INPROC_SERVER, - &IID_IDirectInput, &dinput); + &IID_IDirectInput, (LPVOID)&dinput); if (FAILED(result)) { SetDIerror("CoCreateInstance", result);