Skip to content

Commit

Permalink
dinput8: Fix building with SDL
Browse files Browse the repository at this point in the history
When SDL support was introduced to dinput, it fails linking of dinput8
in a later wine version probably due to pulling in dependecies from
dinput. This commit fixes it by adding the proper depends to
Makefile.in.

Fixes: Commit 045f32e ("dinput: Add SDL support")
Fixes: Commit 0f49071 ("dinput: Implement FF effects for SDL joysticks")
CC: Aric Stewart <[email protected]> wine-mirror#3.15
Signed-off-by: Kai Krakow <[email protected]>
  • Loading branch information
kakra committed Sep 22, 2018
1 parent 31ecdf5 commit e72a677
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion dlls/dinput8/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ MODULE = dinput8.dll
IMPORTLIB = dinput8
IMPORTS = dxguid uuid comctl32 ole32 user32 advapi32
EXTRADEFS = -DDIRECTINPUT_VERSION=0x0800
EXTRALIBS = $(IOKIT_LIBS) $(FORCEFEEDBACK_LIBS)
EXTRALIBS = $(IOKIT_LIBS) $(FORCEFEEDBACK_LIBS) $(SDL2_LIBS)
EXTRAINCL = $(SDL2_CFLAGS)
PARENTSRC = ../dinput

C_SRCS = \
Expand All @@ -11,10 +12,12 @@ C_SRCS = \
device.c \
dinput_main.c \
effect_linuxinput.c \
effect_sdl.c \
joystick.c \
joystick_linux.c \
joystick_linuxinput.c \
joystick_osx.c \
joystick_sdl.c \
keyboard.c \
mouse.c

Expand Down

0 comments on commit e72a677

Please sign in to comment.