TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-12 19:31:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removes dxerr libs from SDL2

Browse source 
SDL2 wa still linking against dxerr.lib and dxerr8.lib but not actually
using any code that requires them. Both libs are deprecated and no
longer included in the Windows SDKs.
This commit is contained in:
chaigler 2018-01-24 08:02:23 -05:00
parent 1ef75b411c
commit 878e09acb2
2 changed files with 1 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Engine/lib/sdl/CMakeLists.txt
View file

@ -1166,11 +1166,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)

2
Engine/lib/sdl/configure.in
View file

@ -3144,7 +3144,7 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau
fi
if test x$have_dinput = xyes; then
AC_DEFINE(SDL_JOYSTICK_DINPUT, 1, [ ])
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -ldinput8 -ldxguid -ldxerr8"
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -ldinput8 -ldxguid"
fi
else
AC_DEFINE(SDL_JOYSTICK_WINMM, 1, [ ])