Skip to content

Commit

Permalink
Add libvorbis and libsydneyaudio
Browse files Browse the repository at this point in the history
  • Loading branch information
doublec committed Jun 24, 2009
1 parent 1412ac6 commit c546b88
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 15 deletions.
6 changes: 6 additions & 0 deletions .gitmodules
Expand Up @@ -4,3 +4,9 @@
[submodule "thirdparty/libtheora"]
path = thirdparty/libtheora
url = git://bluishcoder.co.nz/git/libtheora.git
[submodule "thirdparty/libvorbis"]
path = thirdparty/libvorbis
url = git://bluishcoder.co.nz/git/libvorbis.git
[submodule "thirdparty/libsydneyaudio"]
path = thirdparty/libsydneyaudio
url = git://bluishcoder.co.nz/git/libsydneyaudio.git
7 changes: 5 additions & 2 deletions README
Expand Up @@ -32,6 +32,8 @@ The following are also required but included as submodules:

- libogg
- libtheora
- libvorbis
- libsydneyaudio

For a complete rebuild, including retrieval of this repository
and submodules:
Expand All @@ -44,5 +46,6 @@ and submodules:

Links to Ogg documentation:

libogg - http://www.xiph.org/ogg/doc/libogg/
libtheora - http://theora.org/doc/libtheora-1.0/
libogg - http://www.xiph.org/ogg/doc/libogg/
libtheora - http://theora.org/doc/libtheora-1.0/
libvorbis - http://xiph.org/vorbis/doc/
10 changes: 8 additions & 2 deletions makefile
Expand Up @@ -17,11 +17,17 @@ local/lib/libogg.a: thirdparty/build.sh
local/lib/libtheora.a: thirdparty/build.sh
cd thirdparty && ./build.sh && cd ..

local/lib/libvorbis.a: thirdparty/build.sh
cd thirdparty && ./build.sh && cd ..

local/lib/libsydneyaudio.a: thirdparty/build.sh
cd thirdparty && ./build.sh && cd ..

plogg.o: plogg.cpp
g++ -g -c $(INCLUDE) -Ilocal/include -o plogg.o plogg.cpp

plogg: plogg.o local/lib/libogg.a
g++ -g -o plogg plogg.o local/lib/libtheora.a local/lib/libogg.a -lSDL $(LIBS)
plogg: plogg.o local/lib/libogg.a local/lib/libtheora.a local/lib/libvorbis.a local/lib/libsydneyaudio.a
g++ -g -o plogg plogg.o local/lib/libsydneyaudio.a local/lib/libvorbis.a local/lib/libtheora.a local/lib/libogg.a -lSDL $(LIBS)

clean:
rm *.o plogg
22 changes: 11 additions & 11 deletions thirdparty/build.sh
Expand Up @@ -5,17 +5,17 @@ export PKG_CONFIG_PATH="$PREFIX/local/lib/pkgconfig"
cd libogg
./autogen.sh --prefix=$PREFIX/local --disable-shared --enable-static || exit 1
make && make install || exit 1
#cd ../libvorbis
#./autogen.sh --prefix=$PREFIX/local --with-ogg=$PREFIX/local --disable-shared --enable-static || exit 1
#make && make install || exit 1
cd ../libvorbis
./autogen.sh --prefix=$PREFIX/local --with-ogg=$PREFIX/local --disable-shared --enable-static || exit 1
make && make install || exit 1
cd ../libtheora
./autogen.sh --prefix=$PREFIX/local --with-ogg=$PREFIX/local --with-vorbis=$PREFIX/local --disable-shared --enable-static || exit 1
make && make install || exit 1
#cd ../libsydneyaudio
#./autogen.sh || exit 1
#SOUND_BACKEND=--with-alsa
#if [ $(uname -s) = "Darwin" ]; then
# SOUND_BACKEND=""
#fi
#./configure --prefix=$PREFIX/local --disable-shared --enable-static "$SOUND_BACKEND" || exit 1
#make && make install || exit 1
cd ../libsydneyaudio
./autogen.sh || exit 1
SOUND_BACKEND=--with-alsa
if [ $(uname -s) = "Darwin" ]; then
SOUND_BACKEND=""
fi
./configure --prefix=$PREFIX/local --disable-shared --enable-static "$SOUND_BACKEND" || exit 1
make && make install || exit 1
1 change: 1 addition & 0 deletions thirdparty/libsydneyaudio
Submodule libsydneyaudio added at 6017d0
1 change: 1 addition & 0 deletions thirdparty/libvorbis
Submodule libvorbis added at 90009c

0 comments on commit c546b88

Please sign in to comment.