Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Remove thirdparty submodules

The submodules for libogg, etc have been removed and these are now
expected to be installed separately. Added linking to libSDLmain for
Mac OS X. Tested with the Homebrew package manager on Mac OS X.
  • Loading branch information...
commit 15f8b79f2eb7eaece5e0768bfcbabfc454c0815c 1 parent 491c648
@doublec authored
View
1  .gitignore
@@ -1,5 +1,4 @@
*.swp
*.o
*~
-local
plogg
View
12 .gitmodules
@@ -1,12 +0,0 @@
-[submodule "thirdparty/libogg"]
- path = thirdparty/libogg
- url = git://bluishcoder.co.nz/git/libogg.git
-[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
View
10 README
@@ -28,25 +28,19 @@ You will need the following third party libraries to build:
- boost
- SDL
-
-The following are also required but included as submodules:
-
- libogg
- libtheora
- libvorbis
- libsydneyaudio
-For a complete rebuild, including retrieval of this repository
-and submodules:
+To build:
$ git clone git://github.com/doublec/plogg.git
$ cd plogg
- $ git submodule init
- $ git submodule update
$ make
Links to Ogg documentation:
libogg - http://www.xiph.org/ogg/doc/libogg/
- libtheora - http://theora.org/doc/libtheora-1.0/
+ libtheora - http://theora.org/doc/libtheora-1.1/
libvorbis - http://xiph.org/vorbis/doc/
View
10 makefile
@@ -5,8 +5,8 @@ LIBS=-lasound
endif
ifeq "$(UNAME)" "Darwin"
-INCLUDE=-I/opt/local/include
-LIBS=-framework Carbon -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Cocoa
+#INCLUDE=-I/opt/local/include
+LIBS=-lSDLmain -framework Carbon -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Cocoa
endif
all: plogg
@@ -23,11 +23,11 @@ local/lib/libvorbis.a: thirdparty/build.sh
local/lib/libsydneyaudio.a: thirdparty/build.sh
cd thirdparty && ./build.sh && cd ..
-plogg.o: plogg.cpp local/lib/libogg.a local/lib/libtheora.a local/lib/libvorbis.a local/lib/libsydneyaudio.a
- g++ -g -c $(INCLUDE) -Ilocal/include -o plogg.o plogg.cpp
+plogg.o: plogg.cpp
+ g++ -g -c $(INCLUDE) -o plogg.o plogg.cpp
plogg: plogg.o
- g++ -g -o plogg plogg.o local/lib/libsydneyaudio.a local/lib/libvorbis.a local/lib/libtheora.a local/lib/libogg.a -lSDL $(LIBS)
+ g++ -g -o plogg plogg.o -lsydneyaudio -lvorbis -ltheora -logg -lSDL $(LIBS)
clean:
rm *.o plogg
View
21 thirdparty/build.sh
@@ -1,21 +0,0 @@
-#! /bin/sh
-set -e
-PREFIX=`pwd`/..
-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 ../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
1  thirdparty/libogg
@@ -1 +0,0 @@
-Subproject commit ffa15d2c8f7d814e463823136b7c86e7fa80c396
1  thirdparty/libsydneyaudio
@@ -1 +0,0 @@
-Subproject commit 6017d08b95c945e00f6fa36b3f8baeedbfcbc2ed
1  thirdparty/libtheora
@@ -1 +0,0 @@
-Subproject commit eb40d392bbcf5d88e9c360a221cc0ad6dcf6610f
1  thirdparty/libvorbis
@@ -1 +0,0 @@
-Subproject commit 90009cbf9bae7aae3cbbbb2747793d8fe6cde601
Please sign in to comment.
Something went wrong with that request. Please try again.