Mercurial > sdl-ios-xcode

comparison src/haptic/win32/SDL_syshaptic.c @ 2717:50bc882455e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge of force feedback branch r4039.
author Edgar Simo <bobbens@gmail.com>
date Mon, 25 Aug 2008 17:34:58 +0000
parents 336b604ec15b
children 02aa80d7905f
comparison
equal deleted inserted replaced
2716:f8f68f47285a 2717:50bc882455e5
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
121 */ 121 */
122 static void 122 static void
123 DI_SetError(const char *str, HRESULT err) 123 DI_SetError(const char *str, HRESULT err)
124 { 124 {
125 SDL_SetError("Haptic: %s - %s: %s", str, 125 SDL_SetError("Haptic: %s - %s: %s", str,
126 DXGetErrorString(err), DXGetErrorDescription(err)); 126 DXGetErrorString8A(err), DXGetErrorDescription8A(err));
127 } 127 }
128 128
129 129
130 /* 130 /*
131 * Checks to see if two GUID are the same. 131 * Checks to see if two GUID are the same.