fixed configure script from botched conflict resolution in r43577
svn-id: r43578
This commit is contained in:
parent
3084919b32
commit
021264aad1
1 changed files with 13 additions and 1 deletions
14
configure
vendored
14
configure
vendored
|
@ -110,7 +110,8 @@ _alsa=auto
|
|||
_zlib=auto
|
||||
_mpeg2=no
|
||||
_fluidsynth=auto
|
||||
_16bit=yes_readline=auto
|
||||
_16bit=yes
|
||||
_readline=auto
|
||||
# Default option behaviour yes/no
|
||||
_text_console=no
|
||||
_mt32emu=yes
|
||||
|
@ -637,6 +638,8 @@ DEBFLAGS="-g"
|
|||
|
||||
for ac_option in $@; do
|
||||
case "$ac_option" in
|
||||
--enable-16bit) _16bit=yes ;;
|
||||
--disable-16bit) _16bit=no ;;
|
||||
--disable-hq-scalers) _build_hq_scalers=no ;;
|
||||
--disable-scalers) _build_scalers=no ;;
|
||||
--enable-alsa) _alsa=yes ;;
|
||||
|
@ -1646,6 +1649,11 @@ else
|
|||
fi
|
||||
add_to_config_mk_if_yes "$_mt32emu" 'USE_MT32EMU = 1'
|
||||
|
||||
#
|
||||
# Check whether 16bit color support is requested
|
||||
#
|
||||
add_to_config_mk_if_yes "$_16bit" 'ENABLE_RGB_COLOR = 1'
|
||||
|
||||
#
|
||||
# Check whether to enable the (hq) scalers
|
||||
#
|
||||
|
@ -1996,6 +2004,10 @@ if test "$_nasm" = yes ; then
|
|||
echo_n ", assembly routines"
|
||||
fi
|
||||
|
||||
if test "$_16bit" = yes ; then
|
||||
echo_n ", 16bit color"
|
||||
fi
|
||||
|
||||
if test "$_build_hq_scalers" = yes ; then
|
||||
echo_n ", HQ scalers"
|
||||
fi
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue