Pull OGG sources.

This commit is contained in:
Erik de Castro Lopo 2006-11-01 11:11:01 +11:00
parent 7e8e339020
commit 292b99bb4d
6 changed files with 19 additions and 5 deletions

View File

@ -1,3 +1,4 @@
*.aif
*.aifc
*.aiff
*.au
@ -5,6 +6,8 @@
*.lo
*.loT
*.paf
*.sd2
*.sds
*.svx
*.wav
.deps
@ -35,15 +38,18 @@ libsndfile.spec
libtool
ltmain.sh
missing
rc/OGG/include/ogg/config_types.h
regtest/sndfile-regtest
sndfile.pc
src/*sndfile.def
src/FLAC/tests/test_libFLAC
src/G72x/g72x_test
src/OGG/test_bitwise
src/OGG/test_framing
src/Symbols.darwin
src/Symbols.linux
src/config.h
src/config.h.in
src/*sndfile.def
src/sndfile.h
src/stamp-h1
src/test_endswap

View File

@ -1,3 +1,9 @@
2006-11-01 Erik de Castro Lopo <erikd AT mega-nerd DOT com>
* src/FLAC src/OGG confgure.ac src/Makefile.am
Pull in all required FLAC and OGG code so external libraries are not
needed. This makes compiling on stupid fscking Windoze easier.
2006-10-27 Erik de Castro Lopo <erikd AT mega-nerd DOT com>
* src/sd2.c

View File

@ -575,6 +575,7 @@ AC_CONFIG_FILES([ \
src/FLAC/share/replaygain_synthesis/include/Makefile \
src/FLAC/share/replaygain_synthesis/include/private/Makefile \
src/FLAC/share/grabbag/Makefile src/FLAC/share/utf8/Makefile \
src/OGG/include/ogg/Makefile src/OGG/include/Makefile src/OGG/Makefile \
man/Makefile examples/Makefile tests/Makefile regtest/Makefile \
doc/Makefile doc/libsndfile.css \
Win32/Makefile Octave/Makefile \

View File

@ -45,7 +45,8 @@ CPUCFLAGS = -maltivec -mabi=altivec -DFLAC__NO_ASM
endif
endif
AM_CFLAGS = $(CPUCFLAGS) -I$(top_srcdir)/src/FLAC/include
INCLUDES = -I$(top_srcdir)/src/FLAC/include -I$(top_srcdir)/src/OGG/include
AM_CFLAGS = $(CPUCFLAGS)
if FLaC__NO_ASM
else

View File

@ -23,7 +23,7 @@ test_libFLAC_LDADD = \
$(top_builddir)/src/FLAC/share/replaygain_analysis/libreplaygain_analysis.la \
$(top_builddir)/src/FLAC/test_libs_common/libtest_libs_common.la \
$(top_builddir)/src/FLAC/libFLAC.la \
-logg \
$(top_builddir)/src/OGG/libogg.la \
-lm
test_libFLAC_SOURCES = \

View File

@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
SUBDIRS = FLAC GSM610 G72x
SUBDIRS = OGG FLAC GSM610 G72x
lib_LTLIBRARIES = libsndfile.la
include_HEADERS = sndfile.hh
@ -31,7 +31,7 @@ FILESPECIFIC = aiff.c au.c avr.c caf.c dwd.c flac.c g72x.c htk.c ircam.c macbina
libsndfile_la_LDFLAGS = -no-undefined -version-info @SHARED_VERSION_INFO@ @SHLIB_VERSION_ARG@
libsndfile_la_SOURCES = $(FILESPECIFIC) $(COMMON) $(noinst_HEADERS)
nodist_libsndfile_la_SOURCES = $(nodist_include_HEADERS)
libsndfile_la_LIBADD = FLAC/libFLAC.la GSM610/libgsm.la G72x/libg72x.la -lm -logg
libsndfile_la_LIBADD = FLAC/libFLAC.la GSM610/libgsm.la G72x/libg72x.la OGG/libogg.la -lm
test_endswap_SOURCES = test_endswap.c