Mercurial > SDL_sound_CoreAudio

comparison configure.in @ 562:7e08477b0fc1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
MP3 decoder upgrade work. Ripped out SMPEG and mpglib support, replaced it with "mpg123.c" and libmpg123. libmpg123 is a much better version of mpglib, so it should solve all the problems about MP3's not seeking, or most modern MP3's not playing at all, etc. Since you no longer have to make a tradeoff with SMPEG for features, and SMPEG is basically rotting, I removed it from the project. There is still work to be done with libmpg123...there are MMX, 3DNow, SSE, Altivec, etc decoders which we don't have enabled at the moment, and the build system could use some work to make this compile more cleanly, etc. Still: huge win.
author Ryan C. Gordon <icculus@icculus.org>
date Fri, 30 Jan 2009 02:44:47 -0500
parents f2985e08589c
children cddbe182ae5e
comparison
equal deleted inserted replaced
561:f2985e08589c 562:7e08477b0fc1
52 dnl --------------------------------------------------------------------- 52 dnl ---------------------------------------------------------------------
53 53
54 AC_PROG_CC 54 AC_PROG_CC
55 AC_PROG_INSTALL 55 AC_PROG_INSTALL
56 AC_PROG_LN_S 56 AC_PROG_LN_S
57 AM_PROG_AS
57 AM_PROG_LIBTOOL 58 AM_PROG_LIBTOOL
58 59
59 60
60 dnl --------------------------------------------------------------------- 61 dnl ---------------------------------------------------------------------
61 dnl Debug mode? 62 dnl Debug mode?
170 , enable_midi=yes) 171 , enable_midi=yes)
171 if test x$enable_midi = xyes; then 172 if test x$enable_midi = xyes; then
172 AC_DEFINE(SOUND_SUPPORTS_MIDI, 1, [Define if MIDI support is desired.]) 173 AC_DEFINE(SOUND_SUPPORTS_MIDI, 1, [Define if MIDI support is desired.])
173 fi 174 fi
174 175
175 dnl Check for SMPEG 176 dnl Check for the MP3 decoder...
176 AC_ARG_ENABLE(smpeg, 177 AC_ARG_ENABLE(mpg123,
177 [ --enable-smpeg enable MP3 decoding via smpeg [default=yes]], 178 [ --enable-mpg123 enable MP3 decoding [default=yes]],
178 , enable_smpeg=yes) 179 , enable_mpg123=yes)
179 if test x$enable_smpeg = xyes; then 180 if test x$enable_mpg123 = xyes; then
180 AC_CHECK_HEADER(smpeg.h, have_smpeg_hdr=yes) 181 AC_DEFINE(SOUND_SUPPORTS_MPG123, 1, [Define if MPG123 support is desired.])
181 AC_CHECK_LIB(smpeg, SMPEG_new, have_smpeg_lib=yes) 182 fi
182 if test x$have_smpeg_hdr = xyes -a x$have_smpeg_lib = xyes; then
183 LIBS="$LIBS -lsmpeg"
184 AC_DEFINE(SOUND_SUPPORTS_SMPEG, 1, [Define if SMPEG support is desired.])
185 fi
186 fi
187
188 dnl Check for the MIDI decoder...
189 AC_ARG_ENABLE(mpglib,
190 [ --enable-mpglib enable MP3 decoding internally [default=yes]],
191 , enable_mpglib=yes)
192 if test x$enable_mpglib = xyes; then
193 AC_DEFINE(SOUND_SUPPORTS_MPGLIB, 1, [Define if MPGLIB support is desired.])
194 fi
195
196 183
197 dnl Check for libmikmod 184 dnl Check for libmikmod
198 AC_ARG_ENABLE(mikmod, 185 AC_ARG_ENABLE(mikmod,
199 [ --enable-mikmod enable MOD decoding via mikmod [default=yes]], 186 [ --enable-mikmod enable MOD decoding via mikmod [default=yes]],
200 , enable_mikmod=yes) 187 , enable_mikmod=yes)
339 326
340 CFLAGS="$SDLSOUNDCFLAGS $CFLAGS -D_REENTRANT -D_THREAD_SAFE" 327 CFLAGS="$SDLSOUNDCFLAGS $CFLAGS -D_REENTRANT -D_THREAD_SAFE"
341 328
342 dnl Add Makefile conditionals 329 dnl Add Makefile conditionals
343 AM_CONDITIONAL(USE_TIMIDITY, test x$enable_midi = xyes) 330 AM_CONDITIONAL(USE_TIMIDITY, test x$enable_midi = xyes)
344 AM_CONDITIONAL(USE_MPGLIB, test x$enable_mpglib = xyes) 331 AM_CONDITIONAL(USE_LIBMPG123, test x$enable_mpg123 = xyes)
345 AM_CONDITIONAL(USE_PHYSICSFS, test x$enable_physfs = xyes) 332 AM_CONDITIONAL(USE_PHYSICSFS, test x$enable_physfs = xyes)
346 333
347 AC_OUTPUT([ 334 AC_OUTPUT([
348 Makefile 335 Makefile
349 decoders/Makefile 336 decoders/Makefile
350 decoders/timidity/Makefile 337 decoders/timidity/Makefile
351 decoders/mpglib/Makefile 338 decoders/libmpg123/Makefile
352 playsound/Makefile 339 playsound/Makefile
353 ]) 340 ])