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

1
configure.in
View file

@ -2330,6 +2330,7 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau
if test x$have_dinput = xyes; then if test x$have_dinput = xyes; then
AC_DEFINE(SDL_JOYSTICK_DINPUT) AC_DEFINE(SDL_JOYSTICK_DINPUT)
SOURCES="$SOURCES $srcdir/src/joystick/win32/SDL_dxjoystick.c" SOURCES="$SOURCES $srcdir/src/joystick/win32/SDL_dxjoystick.c"
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -ldinput8 -ldxguid -ldxerr8 -lole32"
else else
AC_DEFINE(SDL_JOYSTICK_WINMM) AC_DEFINE(SDL_JOYSTICK_WINMM)
SOURCES="$SOURCES $srcdir/src/joystick/win32/SDL_mmjoystick.c" SOURCES="$SOURCES $srcdir/src/joystick/win32/SDL_mmjoystick.c"

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

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

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

@ -85,7 +85,7 @@ static void
SetDIerror(const char *function, HRESULT code) SetDIerror(const char *function, HRESULT code)
{ {
SDL_SetError("%s() [%s]: %s", function, SDL_SetError("%s() [%s]: %s", function,
DXGetErrorString(code), DXGetErrorDescription(code)); DXGetErrorString8A(code), DXGetErrorDescription8A(code));
} }

4
src/joystick/win32/SDL_dxjoystick_c.h
View file

@ -42,9 +42,9 @@
/* Used for the c_dfDIJoystick2 symbol (no imports are used) */ /* Used for the c_dfDIJoystick2 symbol (no imports are used) */
# pragma comment (lib, "dinput.lib") # pragma comment (lib, "dinput.lib")
#endif #endif
#include <dxerr.h> #include <dxerr8.h>
#ifdef _MSC_VER #ifdef _MSC_VER
# pragma comment (lib, "dxerr.lib") # pragma comment (lib, "dxerr8.lib")
#endif #endif