Fix compile without DIRECTX
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fc0fd74..5604c92 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1523,11 +1523,6 @@ elseif(WINDOWS)
if(HAVE_DINPUT_H)
set(SDL_JOYSTICK_DINPUT 1)
list(APPEND EXTRA_LIBS dinput8)
- if(CMAKE_COMPILER_IS_MINGW)
- list(APPEND EXTRA_LIBS dxerr8)
- elseif (NOT USE_WINSDK_DIRECTX)
- list(APPEND EXTRA_LIBS dxerr)
- endif()
endif()
if(HAVE_XINPUT_H)
set(SDL_JOYSTICK_XINPUT 1)
diff --git a/src/haptic/windows/SDL_dinputhaptic.c b/src/haptic/windows/SDL_dinputhaptic.c
index 4b9e5e0..322afe9 100644
--- a/src/haptic/windows/SDL_dinputhaptic.c
+++ b/src/haptic/windows/SDL_dinputhaptic.c
@@ -51,10 +51,6 @@ static LPDIRECTINPUT8 dinput = NULL;
static int
DI_SetError(const char *str, HRESULT err)
{
- /*
- SDL_SetError("Haptic: %s - %s: %s", str,
- DXGetErrorString8A(err), DXGetErrorDescription8A(err));
- */
return SDL_SetError("Haptic error %s", str);
}
diff --git a/src/joystick/windows/SDL_dinputjoystick.c b/src/joystick/windows/SDL_dinputjoystick.c
index 5d777a8..1a042ab 100644
--- a/src/joystick/windows/SDL_dinputjoystick.c
+++ b/src/joystick/windows/SDL_dinputjoystick.c
@@ -229,10 +229,6 @@ const DIDATAFORMAT SDL_c_dfDIJoystick2 = {
static int
SetDIerror(const char *function, HRESULT code)
{
- /*
- return SDL_SetError("%s() [%s]: %s", function,
- DXGetErrorString9A(code), DXGetErrorDescription9A(code));
- */
return SDL_SetError("%s() DirectX error 0x%8.8lx", function, code);
}