diff --git a/stepmania/src/Makefile.am b/stepmania/src/Makefile.am index f5eface760..fb964b9395 100644 --- a/stepmania/src/Makefile.am +++ b/stepmania/src/Makefile.am @@ -164,10 +164,6 @@ Sound_Null = \ arch/Sound/RageSoundDriver_Null.cpp \ arch/Sound/RageSoundDriver_Null.h -Sound_SDL = \ - arch/Sound/RageSoundDriver_SDL.cpp \ - arch/Sound/RageSoundDriver_SDL.h - Sound = $(Sound_Null) if ALSA Sound += $(Sound_ALSA9) @@ -175,7 +171,6 @@ endif if HAVE_OSS Sound += $(Sound_OSS) endif -Sound += $(Sound_SDL) stepmania_SOURCES = $(Rage) $(DataStructures) $(FileTypes) $(StepMania) $(Transitions) \ $(Actors) $(ActorsInMenus) $(ActorsInGameplay) $(Screens) $(GlobalSingletons) \ diff --git a/stepmania/src/arch/arch_linux.h b/stepmania/src/arch/arch_linux.h index 460acc4cdf..12e5560702 100644 --- a/stepmania/src/arch/arch_linux.h +++ b/stepmania/src/arch/arch_linux.h @@ -5,15 +5,17 @@ #include "Sound/RageSoundDriver_ALSA9.h" /* #endif HAS_ALSA9 */ #include "Sound/RageSoundDriver_OSS.h" -#endif + /* * Sometimes Alsa and OSS fail to load, so * SDL should be a fallback, even though it * doesn't work perfectly. */ -#include "SDL.h" -#include "Sound/RageSoundDriver_SDL.h" +/* No, it shouldn't. If they fail to load, we should receive a bug report + * and fix our code, not have it silently fall back on a broken driver. -glenn */ +// #include "Sound/RageSoundDriver_SDL.h" +#endif /* * Copyright (c) 2002 by the person(s) listed below. All rights reserved. *