Mercurial > SDL_sound_CoreAudio
changeset 465:636796aed4e2
Build/packaging fixes.
| author | Ryan C. Gordon <icculus@icculus.org> |
|---|---|
| date | Sun, 12 Oct 2003 19:06:44 +0000 |
| parents | 182533748715 |
| children | 75819e5c59d4 |
| files | Makefile.am alt_audio_convert.c audio_convert.c configure.in decoders/Makefile.am |
| diffstat | 5 files changed, 29 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.am Sun Oct 12 19:06:27 2003 +0000 +++ b/Makefile.am Sun Oct 12 19:06:44 2003 +0000 @@ -6,16 +6,12 @@ libSDL_soundinclude_HEADERS = \ SDL_sound.h -if USE_ALTCVT -CVT_SOURCE = alt_audio_convert.c -else -CVT_SOURCE = audio_convert.c -endif - libSDL_sound_la_SOURCES = \ SDL_sound.c \ SDL_sound_internal.h \ - $(CVT_SOURCE) \ + alt_audio_convert.c \ + alt_audio_convert.h \ + audio_convert.c \ extra_rwops.c \ extra_rwops.h @@ -45,8 +41,12 @@ CWProject.sit \ PBProjects.tar.gz \ borland.zip \ - Doxyfile \ - docs + Doxyfile dist-hook: - rm -rf `find $(distdir)/docs -name CVS` + mkdir $(distdir)/docs + echo "Docs are generated with the program "Doxygen" (http://www.doxygen.org/)," >> $(distdir)/docs/README + echo " or can be read online at http://icculus.org/SDL_sound/docs/" >> $(distdir)/docs/README + echo >> $(distdir)/docs/README + rm -rf `find $(distdir) -name "CVS" -type d` +
--- a/alt_audio_convert.c Sun Oct 12 19:06:27 2003 +0000 +++ b/alt_audio_convert.c Sun Oct 12 19:06:44 2003 +0000 @@ -25,6 +25,12 @@ * (This code blatantly abducted for SDL_sound. Thanks, Frank! --ryan.) */ +#if HAVE_CONFIG_H +# include <config.h> +#endif + +#if SOUND_USE_ALTCVT + #include "alt_audio_convert.h" #include <math.h> @@ -1044,3 +1050,8 @@ "return value: %d \n\n\n", ret ); return ret; } + +#endif /* SOUND_USE_ALTCVT */ + +/* end of alt_audio_convert.c ... */ +
--- a/audio_convert.c Sun Oct 12 19:06:27 2003 +0000 +++ b/audio_convert.c Sun Oct 12 19:06:44 2003 +0000 @@ -31,6 +31,8 @@ # include <config.h> #endif +#if !SOUND_USE_ALTCVT + #include "SDL.h" #include "SDL_sound.h" @@ -730,3 +732,8 @@ return(cvt->needed); } /* Sound_BuildAudioCVT */ + +#endif /* !SOUND_USE_ALTCVT */ + +/* end of audio_convert.c ... */ +
--- a/configure.in Sun Oct 12 19:06:27 2003 +0000 +++ b/configure.in Sun Oct 12 19:06:44 2003 +0000 @@ -303,7 +303,6 @@ AM_CONDITIONAL(USE_TIMIDITY, test x$enable_midi = xyes) AM_CONDITIONAL(USE_MPGLIB, test x$enable_mpglib = xyes) AM_CONDITIONAL(USE_PHYSICSFS, test x$enable_physfs = xyes) -AM_CONDITIONAL(USE_ALTCVT, test x$enable_altcvt = xyes) AC_OUTPUT([ Makefile