# HG changeset patch
# User Edgar Simo <bobbens@gmail.com>
# Date 1215076402 0
# Node ID a72a5f62d6b7580175bcb5b7452afec12225a9a2
# Parent  6a2482d4af818aaf72df625924ab7195f0e15647
Haptic subsystem should finally be properly attached to the build system.

diff -r 6a2482d4af81 -r a72a5f62d6b7 Makefile.minimal
--- a/Makefile.minimal	Thu Jul 03 08:48:05 2008 +0000
+++ b/Makefile.minimal	Thu Jul 03 09:13:22 2008 +0000
@@ -15,6 +15,7 @@
 	src/events/*.c \
 	src/file/*.c \
 	src/joystick/*.c \
+	src/haptic/*.c \
 	src/stdlib/*.c \
 	src/thread/*.c \
 	src/timer/*.c \
@@ -22,6 +23,7 @@
 	src/audio/dummy/*.c \
 	src/video/dummy/*.c \
 	src/joystick/dummy/*.c \
+	src/haptic/dummy/*.c \
 	src/cdrom/dummy/*.c \
 	src/thread/generic/*.c \
 	src/timer/dummy/*.c \
diff -r 6a2482d4af81 -r a72a5f62d6b7 include/SDL_config.h.in
--- a/include/SDL_config.h.in	Thu Jul 03 08:48:05 2008 +0000
+++ b/include/SDL_config.h.in	Thu Jul 03 09:13:22 2008 +0000
@@ -215,6 +215,8 @@
 #undef SDL_JOYSTICK_WINMM
 #undef SDL_JOYSTICK_USBHID
 #undef SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H
+#undef SDL_HAPTIC_DUMMY
+#undef SDL_HAPTIC_LINUX
 
 /* Enable various shared object loading systems */
 #undef SDL_LOADSO_BEOS