Commit 225a494d authored by Aric Stewart's avatar Aric Stewart Committed by Alexandre Julliard

dinput: Add Mac OS/X joystick support.

parent a36b408f
......@@ -6078,12 +6078,14 @@ done
for ac_header in \
AudioUnit/AudioUnit.h \
Carbon/Carbon.h \
CoreAudio/CoreAudio.h \
DiskArbitration/DiskArbitration.h \
IOKit/IOKitLib.h \
IOKit/hid/IOHIDLib.h \
alias.h \
alsa/asoundlib.h \
arpa/inet.h \
......
......@@ -263,6 +263,7 @@ AC_CHECK_HEADERS(\
CoreAudio/CoreAudio.h \
DiskArbitration/DiskArbitration.h \
IOKit/IOKitLib.h \
IOKit/hid/IOHIDLib.h \
alias.h \
alsa/asoundlib.h \
arpa/inet.h \
......
......@@ -5,6 +5,7 @@ VPATH = @srcdir@
MODULE = dinput.dll
IMPORTLIB = dinput
IMPORTS = dxguid uuid ole32 user32 advapi32 kernel32
EXTRALIBS = @CARBONLIB@ @IOKITLIB@
C_SRCS = \
data_formats.c \
......@@ -14,6 +15,7 @@ C_SRCS = \
joystick.c \
joystick_linux.c \
joystick_linuxinput.c \
joystick_osx.c \
keyboard.c \
mouse.c \
regsvr.c
......
......@@ -79,7 +79,8 @@ static const struct dinput_device *dinput_devices[] =
&mouse_device,
&keyboard_device,
&joystick_linuxinput_device,
&joystick_linux_device
&joystick_linux_device,
&joystick_osx_device
};
#define NB_DINPUT_DEVICES (sizeof(dinput_devices)/sizeof(dinput_devices[0]))
......
......@@ -58,6 +58,7 @@ extern const struct dinput_device mouse_device;
extern const struct dinput_device keyboard_device;
extern const struct dinput_device joystick_linux_device;
extern const struct dinput_device joystick_linuxinput_device;
extern const struct dinput_device joystick_osx_device;
extern void check_dinput_hooks(LPDIRECTINPUTDEVICE8A);
typedef int (*DI_EVENT_PROC)(LPDIRECTINPUTDEVICE8A, WPARAM, LPARAM);
......
......@@ -255,6 +255,9 @@
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
/* Define to 1 if you have the <IOKit/hid/IOHIDLib.h> header file. */
#undef HAVE_IOKIT_HID_IOHIDLIB_H
/* Define to 1 if you have the <IOKit/IOKitLib.h> header file. */
#undef HAVE_IOKIT_IOKITLIB_H
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment