From dc254180b9e8587dd75389a098d6d9ef746a522c Mon Sep 17 00:00:00 2001 From: chaigler Date: Wed, 24 Jan 2018 08:02:23 -0500 Subject: [PATCH] Removes dxerr libs from SDL2 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. --- Engine/lib/sdl/CMakeLists.txt | 5 ----- Engine/lib/sdl/configure.in | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/Engine/lib/sdl/CMakeLists.txt b/Engine/lib/sdl/CMakeLists.txt index 54a23f0c7..ef82e73a0 100644 --- a/Engine/lib/sdl/CMakeLists.txt +++ b/Engine/lib/sdl/CMakeLists.txt @@ -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) diff --git a/Engine/lib/sdl/configure.in b/Engine/lib/sdl/configure.in index 37c57e288..f38f02e34 100644 --- a/Engine/lib/sdl/configure.in +++ b/Engine/lib/sdl/configure.in @@ -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, [ ])