comparison src/haptic/win32/SDL_syshaptic.c @ 2652:380d926cc5a7 gsoc2008_force_feedback

Fix for mingw compilation of haptic subsystem by Alam.
author Edgar Simo <bobbens@gmail.com>
date Mon, 25 Aug 2008 17:30:39 +0000
parents ff33a65123ce
children
comparison
equal deleted inserted replaced
2651:ff33a65123ce 2652:380d926cc5a7
32 #define WIN32_LEAN_AND_MEAN 32 #define WIN32_LEAN_AND_MEAN
33 #include <windows.h> 33 #include <windows.h>
34 34
35 #define DIRECTINPUT_VERSION 0x0700 /* Need at least DirectX 7 for dwStartDelay */ 35 #define DIRECTINPUT_VERSION 0x0700 /* Need at least DirectX 7 for dwStartDelay */
36 #include <dinput.h> 36 #include <dinput.h>
37 #include <dxerr.h> 37 #include <dxerr8.h>
38 #ifdef _MSC_VER 38 #ifdef _MSC_VER
39 # pragma comment (lib, "dinput8.lib") 39 # pragma comment (lib, "dinput8.lib")
40 # pragma comment (lib, "dxguid.lib") 40 # pragma comment (lib, "dxguid.lib")
41 # pragma comment (lib, "dxerr.lib") 41 # pragma comment (lib, "dxerr8.lib")
42 #endif /* _MSC_VER */ 42 #endif /* _MSC_VER */
43 43
44 /* an ISO hack for VisualC++ */ 44 /* an ISO hack for VisualC++ */
45 #ifdef _MSC_VER 45 #ifdef _MSC_VER
46 #define snprintf _snprintf 46 #define snprintf _snprintf
116 */ 116 */
117 static void 117 static void
118 DI_SetError(const char *str, HRESULT err) 118 DI_SetError(const char *str, HRESULT err)
119 { 119 {
120 SDL_SetError( "Haptic: %s - %s: %s", str, 120 SDL_SetError( "Haptic: %s - %s: %s", str,
121 DXGetErrorString(err), 121 DXGetErrorString8A(err),
122 DXGetErrorDescription(err)); 122 DXGetErrorDescription8A(err));
123 } 123 }
124 124
125 125
126 /* 126 /*
127 * Checks to see if two GUID are the same. 127 * Checks to see if two GUID are the same.