thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change add_to_config_mk_if_no to the more natural add_to_config_mk_if_yes in some cases

Browse source 
svn-id: r31448
This commit is contained in:
Jordi Vilalta Prat 2008-04-08 03:05:31 +00:00
parent 48c9097672
commit 0aff78a05d
1 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

18
configure vendored
View file

@ -1281,11 +1281,10 @@ fi
# #
if test "$_mt32emu" = no ; then if test "$_mt32emu" = no ; then
_def_mt32emu='#undef USE_MT32EMU' _def_mt32emu='#undef USE_MT32EMU'
add_to_config_mk_if_no yes 'USE_MT32EMU = 1'
else else
_def_mt32emu='#define USE_MT32EMU' _def_mt32emu='#define USE_MT32EMU'
add_to_config_mk_if_no no 'USE_MT32EMU = 1'
fi fi
add_to_config_mk_if_yes "$_mt32emu" 'USE_MT32EMU = 1'
# #
# Check for math lib # Check for math lib
@ -1312,11 +1311,10 @@ if test "$_vorbis" = yes ; then
_def_vorbis='#define USE_VORBIS' _def_vorbis='#define USE_VORBIS'
LIBS="$LIBS $OGG_LIBS $VORBIS_LIBS -lvorbisfile -lvorbis -logg" LIBS="$LIBS $OGG_LIBS $VORBIS_LIBS -lvorbisfile -lvorbis -logg"
INCLUDES="$INCLUDES $OGG_CFLAGS $VORBIS_CFLAGS" INCLUDES="$INCLUDES $OGG_CFLAGS $VORBIS_CFLAGS"
add_to_config_mk_if_no no 'USE_VORBIS = 1'
else else
_def_vorbis='#undef USE_VORBIS' _def_vorbis='#undef USE_VORBIS'
add_to_config_mk_if_no yes 'USE_VORBIS = 1'
fi fi
add_to_config_mk_if_yes "$_vorbis" 'USE_VORBIS = 1'
echo "$_vorbis" echo "$_vorbis"
# #
@ -1337,14 +1335,13 @@ if test "$_tremor" = yes && test "$_vorbis" = no; then
_def_vorbis='#define USE_VORBIS' _def_vorbis='#define USE_VORBIS'
LIBS="$LIBS $TREMOR_LIBS -lvorbisidec" LIBS="$LIBS $TREMOR_LIBS -lvorbisidec"
INCLUDES="$INCLUDES $TREMOR_CFLAGS" INCLUDES="$INCLUDES $TREMOR_CFLAGS"
add_to_config_mk_if_no no 'USE_TREMOR = 1'
else else
if test "$_vorbis" = yes; then if test "$_vorbis" = yes; then
_tremor="no (Ogg Vorbis/Tremor support is mutually exclusive)" _tremor="no (Ogg Vorbis/Tremor support is mutually exclusive)"
fi fi
_def_tremor='#undef USE_TREMOR' _def_tremor='#undef USE_TREMOR'
add_to_config_mk_if_no yes 'USE_TREMOR = 1'
fi fi
add_to_config_mk_if_yes "$_tremor" 'USE_TREMOR = 1'
echo "$_tremor" echo "$_tremor"
# #
@ -1368,11 +1365,10 @@ if test "$_flac" = yes ; then
LIBS="$LIBS $FLAC_LIBS -lFLAC" LIBS="$LIBS $FLAC_LIBS -lFLAC"
fi fi
INCLUDES="$INCLUDES $FLAC_CFLAGS" INCLUDES="$INCLUDES $FLAC_CFLAGS"
add_to_config_mk_if_no no 'USE_FLAC = 1'
else else
_def_flac='#undef USE_FLAC' _def_flac='#undef USE_FLAC'
add_to_config_mk_if_no yes 'USE_FLAC = 1'
fi fi
add_to_config_mk_if_yes "$_flac" 'USE_FLAC = 1'
echo "$_flac" echo "$_flac"
# #
@ -1391,11 +1387,10 @@ if test "$_mad" = yes ; then
_def_mad='#define USE_MAD' _def_mad='#define USE_MAD'
LIBS="$LIBS $MAD_LIBS -lmad" LIBS="$LIBS $MAD_LIBS -lmad"
INCLUDES="$INCLUDES $MAD_CFLAGS" INCLUDES="$INCLUDES $MAD_CFLAGS"
add_to_config_mk_if_no no 'USE_MAD = 1'
else else
_def_mad='#undef USE_MAD' _def_mad='#undef USE_MAD'
add_to_config_mk_if_no yes 'USE_MAD = 1'
fi fi
add_to_config_mk_if_yes "$_mad" 'USE_MAD = 1'
echo "$_mad" echo "$_mad"
# #
@ -1480,11 +1475,10 @@ if test "$_mpeg2" = yes ; then
_def_mpeg2='#define USE_MPEG2' _def_mpeg2='#define USE_MPEG2'
INCLUDES="$INCLUDES $MPEG2_CFLAGS" INCLUDES="$INCLUDES $MPEG2_CFLAGS"
LIBS="$LIBS $MPEG2_LIBS -lmpeg2" LIBS="$LIBS $MPEG2_LIBS -lmpeg2"
add_to_config_mk_if_no no 'USE_MPEG2 = 1'
else else
_def_mpeg2='#undef USE_MPEG2' _def_mpeg2='#undef USE_MPEG2'
add_to_config_mk_if_no yes 'USE_MPEG2 = 1'
fi fi
add_to_config_mk_if_yes "$_mpeg2" 'USE_MPEG2 = 1'
echo "$_mpeg2" echo "$_mpeg2"
# #