Commit d7dcae3d authored by Sam Lantinga's avatar Sam Lantinga

*** empty log message ***

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40197
parent d5212526
...@@ -2084,6 +2084,7 @@ case "$target" in ...@@ -2084,6 +2084,7 @@ case "$target" in
if test x$enable_joystick = xyes; then if test x$enable_joystick = xyes; then
JOYSTICK_SUBDIRS="$JOYSTICK_SUBDIRS darwin" JOYSTICK_SUBDIRS="$JOYSTICK_SUBDIRS darwin"
JOYSTICK_DRIVERS="$JOYSTICK_DRIVERS darwin/libjoystick_darwin.la" JOYSTICK_DRIVERS="$JOYSTICK_DRIVERS darwin/libjoystick_darwin.la"
SDL_LIBS="$SDL_LIBS -framework IOKit"
fi fi
# Set up files for the cdrom library # Set up files for the cdrom library
if test x$enable_cdrom = xyes; then if test x$enable_cdrom = xyes; then
......
...@@ -6,3 +6,5 @@ libjoystick_darwin_la_SOURCES = $(SRCS) ...@@ -6,3 +6,5 @@ libjoystick_darwin_la_SOURCES = $(SRCS)
# The SDL joystick driver sources # The SDL joystick driver sources
SRCS = SDL_sysjoystick.c SRCS = SDL_sysjoystick.c
AM_CPPFLAGS = -no-cpp-precomp -I/System/Library/Frameworks/Kernel.framework/Headers/
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
slouken@devolution.com slouken@devolution.com
*/ */
/* SDL joystick driver for Darwn / MacOS X, based on the IOKit HID API */ /* SDL joystick driver for Darwin / MacOS X, based on the IOKit HID API */
/* Written 2001 by Max Horn */ /* Written 2001 by Max Horn */
#include <stdio.h> #include <stdio.h>
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include <mach/mach_error.h> #include <mach/mach_error.h>
#include <IOKit/IOKitLib.h> #include <IOKit/IOKitLib.h>
#include <IOKit/IOCFPlugIn.h> #include <IOKit/IOCFPlugIn.h>
#include <IOKit/IOUSBHIDParser.h> #include <IOKit/hidsystem/IOHIDUsageTables.h>
#include <IOKit/hid/IOHIDLib.h> #include <IOKit/hid/IOHIDLib.h>
#include <IOKit/hid/IOHIDKeys.h> #include <IOKit/hid/IOHIDKeys.h>
#include <CoreFoundation/CoreFoundation.h> #include <CoreFoundation/CoreFoundation.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