Selaa lähdekoodia

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.
chaigler 7 vuotta sitten
vanhempi
commit
878e09acb2
2 muutettua tiedostoa jossa 1 lisäystä ja 6 poistoa
  1. 0 5
      Engine/lib/sdl/CMakeLists.txt
  2. 1 1
      Engine/lib/sdl/configure.in

+ 0 - 5
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)

+ 1 - 1
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, [ ])