*** empty log message ***
authorSam Lantinga <slouken@libsdl.org>
Sun, 23 Sep 2001 21:58:52 +0000
changeset 196 c4c4b221a5e5
parent 195 3669d47b07d3
child 197 ef78524e5f59
*** empty log message ***
configure.in
src/joystick/darwin/Makefile.am
src/joystick/darwin/SDL_sysjoystick.c
--- a/configure.in	Sun Sep 23 21:10:30 2001 +0000
+++ b/configure.in	Sun Sep 23 21:58:52 2001 +0000
@@ -2084,6 +2084,7 @@
         if test x$enable_joystick = xyes; then
             JOYSTICK_SUBDIRS="$JOYSTICK_SUBDIRS darwin"
             JOYSTICK_DRIVERS="$JOYSTICK_DRIVERS darwin/libjoystick_darwin.la"
+            SDL_LIBS="$SDL_LIBS -framework IOKit"
         fi
         # Set up files for the cdrom library
         if test x$enable_cdrom = xyes; then
--- a/src/joystick/darwin/Makefile.am	Sun Sep 23 21:10:30 2001 +0000
+++ b/src/joystick/darwin/Makefile.am	Sun Sep 23 21:58:52 2001 +0000
@@ -6,3 +6,5 @@
 
 # The SDL joystick driver sources
 SRCS =  SDL_sysjoystick.c
+
+AM_CPPFLAGS = -no-cpp-precomp -I/System/Library/Frameworks/Kernel.framework/Headers/
--- a/src/joystick/darwin/SDL_sysjoystick.c	Sun Sep 23 21:10:30 2001 +0000
+++ b/src/joystick/darwin/SDL_sysjoystick.c	Sun Sep 23 21:58:52 2001 +0000
@@ -20,7 +20,7 @@
 	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 */
 
 #include <stdio.h>
@@ -33,7 +33,7 @@
 #include <mach/mach_error.h>
 #include <IOKit/IOKitLib.h>
 #include <IOKit/IOCFPlugIn.h>
-#include <IOKit/IOUSBHIDParser.h>
+#include <IOKit/hidsystem/IOHIDUsageTables.h>
 #include <IOKit/hid/IOHIDLib.h>
 #include <IOKit/hid/IOHIDKeys.h>
 #include <CoreFoundation/CoreFoundation.h>