Mercurial > SDL_sound_CoreAudio
changeset 488:b8f694c12010 stable-1.0
Backport from devtree: Fixed automake nonsense.
| author | Ryan C. Gordon <icculus@icculus.org> |
|---|---|
| date | Mon, 30 May 2005 20:13:26 +0000 |
| parents | 3f03af31e246 |
| children | 1b91006ebfef |
| files | CHANGELOG playsound/Makefile.am playsound/physfsrwops.c |
| diffstat | 3 files changed, 5 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/CHANGELOG Fri Nov 12 08:26:11 2004 +0000 +++ b/CHANGELOG Mon May 30 20:13:26 2005 +0000 @@ -2,6 +2,7 @@ * CHANGELOG. */ +05302005 - Backport from devtree: Fixed automake nonsense. 11122004 - Backport from devtree: fix .voc decoder crash on file open. 05082004 - Fixed "bootstrap" to work with MacOSX. 05072004 - Backed out some commits, converted repository to Subversion, and
--- a/playsound/Makefile.am Fri Nov 12 08:26:11 2004 +0000 +++ b/playsound/Makefile.am Mon May 30 20:13:26 2005 +0000 @@ -4,18 +4,13 @@ if USE_PHYSICSFS PHYSFS_CFLG = -DSUPPORT_PHYSFS=1 -PHYSFS_SRCS = physfsrwops.c physfsrwops.h PHYSFS_LIBS = -lphysfs -EXTRAPHYSFS_SRCS = else PHYSFS_CFLG = PHYSFS_SRCS = PHYSFS_LIBS = -EXTRAPHYSFS_SRCS = physfsrwops.c physfsrwops.h endif playsound_CFLAGS = $(PHYSFS_CFLG) playsound_LDADD = ../libSDL_sound.la $(PHYSFS_LIBS) -playsound_SOURCES = playsound.c $(PHYSFS_SRCS) - -EXTRA_DIST = $(EXTRAPHYSFS_SRCS) \ No newline at end of file +playsound_SOURCES = playsound.c physfsrwops.c physfsrwops.h
--- a/playsound/physfsrwops.c Fri Nov 12 08:26:11 2004 +0000 +++ b/playsound/physfsrwops.c Mon May 30 20:13:26 2005 +0000 @@ -19,6 +19,8 @@ * This file was written by Ryan C. Gordon. (icculus@clutteredmind.org). */ +#if SUPPORT_PHYSFS + #include <stdio.h> /* used for SEEK_SET, SEEK_CUR, SEEK_END ... */ #include "physfsrwops.h" @@ -187,6 +189,7 @@ return(create_rwops(PHYSFS_openAppend(fname))); } /* PHYSFSRWOPS_openAppend */ +#endif /* end of physfsrwops.c ... */