[xiph-cvs] cvs commit: theora/examples Makefile.am
Ralph Giles
giles at xiph.org
Fri Mar 19 15:19:00 PST 2004
giles 04/03/19 18:19:00
Modified: . configure.ac
examples Makefile.am
Log:
Remove splayer from the build. I'm tired of fighting portaudio.
Hopefully people can use realplayer/mplayer/etc. for playback on windows
and macos in the meantime.
Revision Changes Path
1.6 +0 -11 theora/configure.ac
Index: configure.ac
===================================================================
RCS file: /usr/local/cvsroot/theora/configure.ac,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- a/configure.ac 13 Mar 2004 19:43:33 -0000 1.5
+++ b/configure.ac 19 Mar 2004 23:18:59 -0000 1.6
@@ -105,20 +105,9 @@
break
],AC_MSG_WARN([OSS audio support not found -- not compiling player_example]))
-AC_CHECK_LIB(portaudio, Pa_OpenStream, [
- AC_CHECK_HEADER(portaudio.h, [HAVE_PORTAUDIO=yes])
- ],,[-lpthread]
-)
-if test "x$HAVE_PORTAUDIO" != xyes; then
- AC_MSG_WARN([portaudio not found -- not compiling splayer example])
-fi
-
if test x$HAVE_SDL = xyes -a x$HAVE_OSS = xyes; then
BUILDABLE_EXAMPLES="$BUILDABLE_EXAMPLES player_example"
fi
-if test x$HAVE_SDL = xyes -a x$HAVE_PORTAUDIO = xyes; then
- BUILDABLE_EXAMPLES="$BUILDABLE_EXAMPLES splayer"
-fi
AC_SUBST(BUILDABLE_EXAMPLES)
dnl --------------------------------------------------
<p><p>1.18 +1 -4 theora/examples/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/theora/examples/Makefile.am,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- a/Makefile.am 7 Mar 2004 07:49:45 -0000 1.17
+++ b/Makefile.am 19 Mar 2004 23:18:59 -0000 1.18
@@ -7,7 +7,7 @@
noinst_PROGRAMS = encoder_example dump_video $(BUILDABLE_EXAMPLES)
# possible contents of BUILDABLE_EXAMPLES:
-EXTRA_PROGRAMS = player_example splayer
+EXTRA_PROGRAMS = player_example
CFLAGS = $(SDL_CFLAGS)
LDADD = ../lib/libtheora.la -logg
@@ -18,9 +18,6 @@
player_example_SOURCES = player_example.c
player_example_LDADD = $(LDADD) $(SDL_LIBS) -lvorbis -lm
-splayer_SOURCES = splayer.c
-splayer_LDADD = $(LDADD) $(SDL_LIBS) -lvorbis -lportaudio -lpthread -lm
-
encoder_example_SOURCES = encoder_example.c
EXTRA_encoder_example_SOURCES = getopt.c getopt1.c getopt.h
encoder_example_LDADD = $(GETOPT_OBJS) $(LDADD) -lvorbisenc -lvorbis -lm
<p><p>--- >8 ----
List archives: http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body. No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.
More information about the commits
mailing list