From f3a0aca8ff9fdfe01a35d7df9789e7dffd8f41ec Mon Sep 17 00:00:00 2001
From: Edgar Simo <bobbens@gmail.com>
Date: Mon, 25 Aug 2008 17:34:58 +0000
Subject: [PATCH] Merge of force feedback branch r4039.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403167
---
configure.in | 1 +
src/haptic/win32/SDL_syshaptic.c | 6 +++---
src/joystick/win32/SDL_dxjoystick.c | 2 +-
src/joystick/win32/SDL_dxjoystick_c.h | 4 ++--
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/configure.in b/configure.in
index e944e817..082d1b84 100644
--- a/configure.in
+++ b/configure.in
@@ -2330,6 +2330,7 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau
if test x$have_dinput = xyes; then
AC_DEFINE(SDL_JOYSTICK_DINPUT)
SOURCES="$SOURCES $srcdir/src/joystick/win32/SDL_dxjoystick.c"
+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS -ldinput8 -ldxguid -ldxerr8 -lole32"
else
AC_DEFINE(SDL_JOYSTICK_WINMM)
SOURCES="$SOURCES $srcdir/src/joystick/win32/SDL_mmjoystick.c"
diff --git a/src/haptic/win32/SDL_syshaptic.c b/src/haptic/win32/SDL_syshaptic.c
index 14c3709e..f01a87e9 100644
--- a/src/haptic/win32/SDL_syshaptic.c
+++ b/src/haptic/win32/SDL_syshaptic.c
@@ -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));
}
diff --git a/src/joystick/win32/SDL_dxjoystick.c b/src/joystick/win32/SDL_dxjoystick.c
index 76c81af9..8fa5c468 100644
--- a/src/joystick/win32/SDL_dxjoystick.c
+++ b/src/joystick/win32/SDL_dxjoystick.c
@@ -85,7 +85,7 @@ static void
SetDIerror(const char *function, HRESULT code)
{
SDL_SetError("%s() [%s]: %s", function,
- DXGetErrorString(code), DXGetErrorDescription(code));
+ DXGetErrorString8A(code), DXGetErrorDescription8A(code));
}
diff --git a/src/joystick/win32/SDL_dxjoystick_c.h b/src/joystick/win32/SDL_dxjoystick_c.h
index b7ae05da..1014591f 100644
--- a/src/joystick/win32/SDL_dxjoystick_c.h
+++ b/src/joystick/win32/SDL_dxjoystick_c.h
@@ -42,9 +42,9 @@
/* Used for the c_dfDIJoystick2 symbol (no imports are used) */
# pragma comment (lib, "dinput.lib")
#endif
-#include <dxerr.h>
+#include <dxerr8.h>
#ifdef _MSC_VER
-# pragma comment (lib, "dxerr.lib")
+# pragma comment (lib, "dxerr8.lib")
#endif
--
2.18.1