changeset 479:35dfa9d9782e

Fixed automake nonsense.
author Ryan C. Gordon <icculus@icculus.org>
date Fri, 12 Nov 2004 08:04:00 +0000
parents 15a540505a02
children 00b61987b555
files CHANGELOG playsound/Makefile.am playsound/physfsrwops.c
diffstat 3 files changed, 5 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/CHANGELOG	Thu Jul 29 09:26:14 2004 +0000
+++ b/CHANGELOG	Fri Nov 12 08:04:00 2004 +0000
@@ -2,6 +2,7 @@
  * CHANGELOG.
  */
 
+11122004 - Fixed automake nonsense.
 05112004 - Added Sound_GetDuration() and moved total_time out of Sound_Sample
            struct and into it's opaque data...this fixes binary compatibility
            with apps written for SDL_sound 1.0.
--- a/playsound/Makefile.am	Thu Jul 29 09:26:14 2004 +0000
+++ b/playsound/Makefile.am	Fri Nov 12 08:04:00 2004 +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	Thu Jul 29 09:26:14 2004 +0000
+++ b/playsound/physfsrwops.c	Fri Nov 12 08:04:00 2004 +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 ... */