commit edfe6b25f767f3d15acd4c72db5541dac10dd64a
author stfx <stfx@hotmail.de> Mon Jun 15 10:31:16 2020 +0200
committer stfx <stfx@hotmail.de> Mon Jun 15 10:31:16 2020 +0200
tree f450ae2d59e89eddce40985a49eddaa85b98dda4
parent 1ad1f93686ace8c05e865748a7fed78f7d2f3298

Fix compile without DIRECTX

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fc0fd74..5604c92 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1523,11 +1523,6 @@
     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)

src/haptic/windows/SDL_dinputhaptic.c

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 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);
 }
 

src/joystick/windows/SDL_dinputjoystick.c

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 @@
 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);
 }