encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix compile without DIRECTX

This commit is contained in:
stfx 2020-06-15 10:31:16 +02:00
parent 9db16a6557
commit efe0935904
3 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -1523,11 +1523,6 @@ elseif(WINDOWS)
if(HAVE_DINPUT_H) if(HAVE_DINPUT_H)
set(SDL_JOYSTICK_DINPUT 1) set(SDL_JOYSTICK_DINPUT 1)
list(APPEND EXTRA_LIBS dinput8) 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() endif()
if(HAVE_XINPUT_H) if(HAVE_XINPUT_H)
set(SDL_JOYSTICK_XINPUT 1) set(SDL_JOYSTICK_XINPUT 1)

4
src/haptic/windows/SDL_dinputhaptic.c
View File

@ -51,10 +51,6 @@ static LPDIRECTINPUT8 dinput = NULL;
static int static int
DI_SetError(const char *str, HRESULT err) 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); return SDL_SetError("Haptic error %s", str);
} }

4
src/joystick/windows/SDL_dinputjoystick.c
View File

@ -229,10 +229,6 @@ const DIDATAFORMAT SDL_c_dfDIJoystick2 = {
static int static int
SetDIerror(const char *function, HRESULT code) 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); return SDL_SetError("%s() DirectX error 0x%8.8lx", function, code);
} }