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
This commit is contained in:
+3
-11
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user