remove SDL from Makefile; used only by Mac build now

stepmania/configure.ac

@@ -98,21 +98,6 @@ fi
 
 SM_X_WITH_OPENGL
 
-AC_ARG_ENABLE(sdl, AC_HELP_STRING([--enable-sdl], [Enable SDL support]), enable_sdl=$enableval, enable_sdl=no)
-if test "$enable_sdl" = "yes"; then
-	AM_PATH_SDL(1.2.6,have_sdl=yes,have_sdl=no)
-fi
-AM_CONDITIONAL(HAVE_SDL, test "$have_sdl" = "yes")
-if test "$have_sdl" = "yes"; then
-	AC_DEFINE(HAVE_SDL, 1, [SDL is available])
-fi
-
-# sdl-config puts -L/usr/lib in the library search path, which reorders things
-# in a way that breaks some configurations.
-# Does this still need to be in?
-# not sure
-# SDL_LIBS="`echo $SDL_LIBS | sed 's_-L/usr/lib/\?[[ $]]__'`"
-
 have_libpng=yes
 AC_CHECK_LIB(png, png_create_read_struct, [x=y], have_libpng=no, [-lz -lm]) # x=y to stop autoconf from messing with LIBS
 AC_CHECK_HEADER(png.h, , have_libpng=no)

stepmania/src/Makefile.am

@@ -184,16 +184,6 @@ Dialog = arch/Dialog/Dialog.cpp arch/Dialog/Dialog.h arch/Dialog/DialogDriver.h
 
 Threads = arch/Threads/Threads.h
 
-if HAVE_SDL
-LoadingWindow += arch/LoadingWindow/LoadingWindow_SDL.cpp arch/LoadingWindow/LoadingWindow_SDL.h
-StepMania += SDL_utils.cpp SDL_utils.h
-if !HAVE_X11
-#InputHandler_SDL depends on LowLevelWindow_SDL
-InputHandler += arch/InputHandler/InputHandler_SDL.cpp arch/InputHandler/InputHandler_SDL.h
-LowLevelWindow += arch/LowLevelWindow/LowLevelWindow_SDL.cpp arch/LowLevelWindow/LowLevelWindow_SDL.h
-endif
-endif
-
 if HAVE_X11
 # InputHandler_X11 depends on LowLevelWindow_X11
 InputHandler += arch/InputHandler/InputHandler_X11.cpp arch/InputHandler/InputHandler_X11.h
@@ -401,7 +391,6 @@ main_SOURCES = $(Screens) \
 
 main_LDADD = \
 		  $(AUDIO_LIBS) \
-		  $(SDL_LIBS) \
 		  $(XLIBS) \
 		  $(srcdir)/libresample/libresample.a
 
@@ -492,4 +481,4 @@ test_threads_SOURCES = \
 		$(all_test_SOURCES) \
 		tests/test_threads.cpp
 
-INCLUDES = $(LUA_CFLAGS) $(SDL_CFLAGS)
+INCLUDES = $(LUA_CFLAGS)