RCS file: /cvsroot/scummvm/scummvm/configure,v
retrieving revision 1.65
diff -u -3 -p -r1.65 configure
|
|
CXXFLAGS="$CXXFLAGS $CPPFLAGS"
|
26 | 26 | |
27 | 27 | # default lib behaviour yes/no/auto |
28 | 28 | _vorbis=auto |
| 29 | _flac=auto |
29 | 30 | _mad=auto |
30 | 31 | _alsa=auto |
31 | 32 | _zlib=auto |
… |
… |
Optional Libraries:
|
199 | 200 | --with-ogg-prefix=PFX Prefix where libogg is installed (optional) |
200 | 201 | --with-vorbis-prefix=PFX Prefix where libvorbis is installed (optional) |
201 | 202 | --disable-vorbis disable Ogg Vorbis support [autodetect] |
| 203 | --with-flac-prefix=PFX Prefix where libFLAC is installed (optional) |
| 204 | --disable-flac disable FLAC support [autodetect] |
202 | 205 | --with-mad-prefix=PFX Prefix where libmad is installed (optional) |
203 | 206 | --disable-mad disable libmad (MP3) support [autodetect] |
204 | 207 | --with-zlib-prefix=PFX Prefix where zlib is installed (optional) |
… |
… |
for ac_option in $@; do
|
226 | 229 | --disable-alsa) _alsa=no ;; |
227 | 230 | --enable-vorbis) _vorbis=yes ;; |
228 | 231 | --disable-vorbis) _vorbis=no ;; |
| 232 | --enable-flac) _flac=yes ;; |
| 233 | --disable-flac) _flac=no ;; |
229 | 234 | --enable-mad) _mad=yes ;; |
230 | 235 | --disable-mad) _mad=no ;; |
231 | 236 | --enable-zlib) _zlib=yes ;; |
… |
… |
for ac_option in $@; do
|
251 | 256 | VORBIS_CFLAGS="-I$_prefix/include" |
252 | 257 | VORBIS_LIBS="-L$_prefix/lib" |
253 | 258 | ;; |
| 259 | --with-flac-prefix=*) |
| 260 | _prefix=`echo $ac_option | cut -d '=' -f 2` |
| 261 | FLAC_CFLAGS="-I$_prefix/include" |
| 262 | FLAC_LIBS="-L$_prefix/lib" |
| 263 | ;; |
254 | 264 | --with-mad-prefix=*) |
255 | 265 | _prefix=`echo $ac_option | cut -d '=' -f 2` |
256 | 266 | MAD_CFLAGS="-I$_prefix/include" |
… |
… |
else
|
566 | 576 | fi |
567 | 577 | echo "$_vorbis" |
568 | 578 | |
| 579 | echocheck "FLAC" |
| 580 | if test "$_flac" = auto ; then |
| 581 | _flac=no |
| 582 | cat > $TMPC << EOF |
| 583 | #include <FLAC/seekable_stream_decoder.h> |
| 584 | int main(void) { FLAC__seekable_stream_decoder_init( 0 ); return 0; } |
| 585 | EOF |
| 586 | cc_check $LDFLAGS $CXXFLAGS $FLAC_CFLAGS $FLAY_LIBS \ |
| 587 | -lFLAC -lm && _flac=yes |
| 588 | fi |
| 589 | if test "$_flac" = yes ; then |
| 590 | _def_flac='#define USE_FLAC' |
| 591 | LIBS="$LIBS $FLAC_LIBS -lFLAC" |
| 592 | INCLUDES="$INCLUDES $FLAC_CFLAGS" |
| 593 | else |
| 594 | _def_flac='#undef USE_FLAC' |
| 595 | fi |
| 596 | echo "$_flac" |
| 597 | |
569 | 598 | echocheck "MAD" |
570 | 599 | if test "$_mad" = auto ; then |
571 | 600 | _mad=no |
… |
… |
typedef signed $type_4_byte int32;
|
738 | 767 | |
739 | 768 | /* Libs */ |
740 | 769 | $_def_vorbis |
| 770 | $_def_flac |
741 | 771 | $_def_mad |
742 | 772 | $_def_alsa |
743 | 773 | $_def_zlib |