TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-29 00:05:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2165 from chaigler/SDL2_cmake_fix

Browse source 
Remove dxerr.lib dependency
This commit is contained in:
Areloch 2018-01-31 16:28:40 -06:00 • committed by GitHub
commit ee69e7d1bb
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) 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)

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 fi
if test x$have_dinput = xyes; then if test x$have_dinput = xyes; then
AC_DEFINE(SDL_JOYSTICK_DINPUT, 1, [ ]) AC_DEFINE(SDL_JOYSTICK_DINPUT, 1, [ ])
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -ldinput8 -ldxguid -ldxerr8" EXTRA_LDFLAGS="$EXTRA_LDFLAGS -ldinput8 -ldxguid"
fi fi
else else
AC_DEFINE(SDL_JOYSTICK_WINMM, 1, [ ]) AC_DEFINE(SDL_JOYSTICK_WINMM, 1, [ ])