From 447e32c040ab268176f91c0f843b7b7d70f6c6b6 Mon Sep 17 00:00:00 2001 From: meep-eep Date: Wed, 20 Nov 2002 04:16:00 +0000 Subject: [PATCH] Made it work. git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@224 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/build/build.config | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/sc2/build/build.config b/sc2/build/build.config index d5c650cab..6a28b7193 100644 --- a/sc2/build/build.config +++ b/sc2/build/build.config @@ -75,17 +75,22 @@ CHOICE_sound_OPTIONS="SDL_mixer openal" 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=' - eval SOUNDMODULE=sdl; - use_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=' - eval CFLAGS="$CFLAGS -DSOUNDMODULE_OPENAL"; - eval SOUNDMODULE=openal; - use_library openal; - use_library vorbisfile' -# use_library vorbis; +CHOICE_sound_OPTION_openal_ACTION=sound_openal_action +sound_openal_action() { + CFLAGS="$CFLAGS -DSOUNDMODULE_OPENAL" + SOUNDMODULE=openal + use_library openal + use_library vorbisfile +# use_library vorbis +} CHOICE_sound_DEFAULT=SDL_mixer CHOICE_link_OPTIONS="static dynamic"