mirror of https://github.com/encounter/SDL.git
Fix compile without DIRECTX
This commit is contained in:
parent
9db16a6557
commit
efe0935904
|
@ -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)
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue