Removed outdated iPodLinux support

libsdl-org · Sep 19, 2009 · 18dc173 · 18dc173
1 parent be07d75
commit 18dc173
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 863 deletions.
diff --git a/configure.in b/configure.in
@@ -943,20 +943,6 @@ CheckVisibilityHidden()
 }
 
 
-dnl Do the iPod thing
-CheckIPod()
-{
-    AC_ARG_ENABLE(ipod,
-AC_HELP_STRING([--enable-ipod], [configure SDL to work with iPodLinux [default=yes on arm-elf]]),
-        , enable_ipod=yes)
-
-    if test x$enable_ipod = xyes; then
-        EXTRA_CFLAGS="$EXTRA_CFLAGS -DIPOD"
-        AC_DEFINE(SDL_VIDEO_DRIVER_IPOD)
-        SOURCES="$SOURCES $srcdir/src/video/ipod/*.c"
-    fi
-}
-
 dnl Find the nanox include and library directories
 CheckNANOX()
 {
@@ -2004,7 +1990,7 @@ AC_HELP_STRING([--enable-pthread-sem], [use pthread semaphores [[default=yes]]])
             pthread_lib="-lpthread"
             ;;
     esac
-    if test x$enable_threads = xyes -a x$enable_pthreads = xyes -a x$enable_ipod != xyes; then
+    if test x$enable_threads = xyes -a x$enable_pthreads = xyes; then
         # Save the original compiler flags and libraries
         ac_save_cflags="$CFLAGS"; ac_save_libs="$LIBS"
         # Add the pthread compiler flags and libraries

diff --git a/include/SDL_config.h.in b/include/SDL_config.h.in
@@ -266,7 +266,6 @@
 #undef SDL_VIDEO_DRIVER_DUMMY
 #undef SDL_VIDEO_DRIVER_FBCON
 #undef SDL_VIDEO_DRIVER_GEM
-#undef SDL_VIDEO_DRIVER_IPOD
 #undef SDL_VIDEO_DRIVER_NANOX
 #undef SDL_VIDEO_DRIVER_NDS
 #undef SDL_VIDEO_DRIVER_OS2FS

diff --git a/src/events/SDL_events.c b/src/events/SDL_events.c
@@ -195,12 +195,10 @@ SDL_StopEventThread(void)
         SDL_EventThread = NULL;
         SDL_DestroyMutex(SDL_EventLock.lock);
     }
-#ifndef IPOD
     if (SDL_EventQ.lock) {
         SDL_DestroyMutex(SDL_EventQ.lock);
         SDL_EventQ.lock = NULL;
     }
-#endif
 }
 
 Uint32

diff --git a/src/events/SDL_sysevents.h b/src/events/SDL_sysevents.h
@@ -33,10 +33,6 @@
 #define CANT_THREAD_EVENTS
 #endif
 
-#ifdef IPOD                     /* iPod doesn't support threading at all */
-#define CANT_THREAD_EVENTS
-#endif
-
 #ifdef __OS2__                  /* The OS/2 event loop runs in a separate thread */
 #define MUST_THREAD_EVENTS
 #endif

diff --git a/src/video/SDL_sysvideo.h b/src/video/SDL_sysvideo.h
@@ -344,9 +344,6 @@ extern VideoBootStrap X11_bootstrap;
 #if SDL_VIDEO_DRIVER_NANOX
 extern VideoBootStrap NX_bootstrap;
 #endif
-#if SDL_VIDEO_DRIVER_IPOD
-extern VideoBootStrap iPod_bootstrap;
-#endif
 #if SDL_VIDEO_DRIVER_WSCONS
 extern VideoBootStrap WSCONS_bootstrap;
 #endif

diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c
@@ -58,9 +58,6 @@ static VideoBootStrap *bootstrap[] = {
 #if SDL_VIDEO_DRIVER_NANOX
     &NX_bootstrap,
 #endif
-#if SDL_VIDEO_DRIVER_IPOD
-    &iPod_bootstrap,
-#endif
 #if SDL_VIDEO_DRIVER_WSCONS
     &WSCONS_bootstrap,
 #endif