From d6560a80bbbc26e1510d624e8aa1378e3189764e Mon Sep 17 00:00:00 2001
From: meep-eep <meep-eep@8092fc87-c524-0410-9efc-e669fe64eaf9>
Date: Wed, 29 Jan 2003 20:43:54 +0000
Subject: [PATCH] Remove SDL_mixer from config, default to MixSDL.

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@598 8092fc87-c524-0410-9efc-e669fe64eaf9
---
 sc2/build/build.config | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/sc2/build/build.config b/sc2/build/build.config
index 1502c30bf..905ca3016 100644
--- a/sc2/build/build.config
+++ b/sc2/build/build.config
@@ -74,16 +74,8 @@ graphics_opengl_action() {
 }
 CHOICE_graphics_DEFAULT=opengl
 
-CHOICE_sound_OPTIONS="SDL_mixer openal mixsdl"
+CHOICE_sound_OPTIONS="openal mixsdl"
 CHOICE_sound_TITLE="Sound backend"
-CHOICE_sound_OPTION_SDL_mixer_TITLE="Use SDL_mixer for sound"
-CHOICE_sound_OPTION_SDL_mixer_PRECOND="have_library SDL_mixer"
-CHOICE_sound_OPTION_SDL_mixer_ACTION=sound_sdl_action
-sound_sdl_action() {
-	CFLAGS="$CFLAGS -DSOUNDMODULE_SDL"
-	eval SOUNDMODULE=sdl
-	use_library SDL_mixer
-}
 CHOICE_sound_OPTION_openal_TITLE="Use OpenAL for sound (experimental)"
 CHOICE_sound_OPTION_openal_PRECOND="have_library openal"
 CHOICE_sound_OPTION_openal_ACTION=sound_openal_action
@@ -94,7 +86,7 @@ sound_openal_action() {
 	use_library vorbisfile
 #	use_library vorbis
 }
-CHOICE_sound_OPTION_mixsdl_TITLE="Use MixSDL for sound (experimental)"
+CHOICE_sound_OPTION_mixsdl_TITLE="Use MixSDL for sound"
 CHOICE_sound_OPTION_mixsdl_ACTION=sound_mixsdl_action
 sound_mixsdl_action() {
 	CFLAGS="$CFLAGS -DSOUNDMODULE_MIXSDL"
@@ -102,7 +94,7 @@ sound_mixsdl_action() {
 	use_library vorbisfile
 #	use_library vorbis
 }
-CHOICE_sound_DEFAULT=SDL_mixer
+CHOICE_sound_DEFAULT=mixsdl
 
 CHOICE_link_OPTIONS="static dynamic"
 CHOICE_link_TITLE="Linking"