merge changes from theora-trunk theora-oil
authorj <j@xiph.org>
Mon, 28 Nov 2005 16:23:34 +0000 (16:23 +0000)
committerj <j@xiph.org>
Mon, 28 Nov 2005 16:23:34 +0000 (16:23 +0000)
svn path=/branches/theora-oil/; revision=10497

1  2 
configure.ac
examples/Makefile.am
lib/encoder_toplevel.c
tests/Makefile.am

diff --cc configure.ac
Simple merge
@@@ -7,13 -7,16 +7,16 @@@ noinst_PROGRAMS = dump_video $(BUILDABL
  # possible contents of BUILDABLE_EXAMPLES:
  EXTRA_PROGRAMS = player_example encoder_example
  
 -AM_CFLAGS = $(OGG_CFLAGS)
 -LDADD = ../lib/libtheora.la $(OGG_LIBS)
 +AM_CFLAGS = $(SDL_CFLAGS) $(OGG_CFLAGS) $(LIBOIL_CFLAGS)
 +LDADD = ../lib/libtheora.la $(OGG_LIBS) $(LIBOIL_LIBS)
  
  dump_video_SOURCES = dump_video.c
- dump_video_LDADD = $(LDADD)
+ EXTRA_dump_video_SOURCES = getopt.c getopt1.c getopt.h
+ dump_video_LDADD = $(GETOPT_OBJS) $(LDADD)
+ dump_video_DEPENDENCIES = $(GETOPT_OBJS)
  
  player_example_SOURCES = player_example.c
+ player_example_CFLAGS = $(SDL_CFLAGS) $(OGG_CFLAGS) $(VORBIS_CFLAGS)
  player_example_LDADD = $(LDADD) $(SDL_LIBS) $(VORBIS_LIBS)
  
  encoder_example_SOURCES = encoder_example.c
Simple merge
@@@ -2,8 -2,10 +2,10 @@@ INCLUDES = -I$(top_srcdir)/includ
  
  noinst_HEADERS = tests.h
  
+ AM_CFLAGS = $(OGG_CFLAGS)
  THEORADIR = ../lib
 -THEORA_LIBS = $(THEORADIR)/libtheora.la $(OGG_LIBS)
 +THEORA_LIBS = $(THEORADIR)/libtheora.la $(OGG_LIBS) $(LIBOIL_LIBS)
  
  test: check