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

Merge of force feedback branch r4039.

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403167
This commit is contained in:
Edgar Simo 2008-08-25 17:34:58 +00:00
parent 0eeb8c92b6
commit f3a0aca8ff
4 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -34,11 +34,11 @@
#define DIRECTINPUT_VERSION 0x0700 /* Need at least DirectX 7 for dwStartDelay */
#include <dinput.h>
#include <dxerr.h>
#include <dxerr8.h>
#ifdef _MSC_VER
# pragma comment (lib, "dinput8.lib")
# pragma comment (lib, "dxguid.lib")
# pragma comment (lib, "dxerr.lib")
# pragma comment (lib, "dxerr8.lib")
#endif /* _MSC_VER */
/* an ISO hack for VisualC++ */
@ -123,7 +123,7 @@ static void
DI_SetError(const char *str, HRESULT err)
{
SDL_SetError("Haptic: %s - %s: %s", str,
DXGetErrorString(err), DXGetErrorDescription(err));
DXGetErrorString8A(err), DXGetErrorDescription8A(err));
}