Menu
▾
▴
SF.net SVN: alleg: [9755] allegro/branches/4.3.10plus
|
From: <mm...@us...> - 2007-12-31 19:24:15
|
Revision: 9755
http://alleg.svn.sourceforge.net/alleg/?rev=9755&view=rev
Author: mmimica
Date: 2007-12-31 11:24:17 -0800 (Mon, 31 Dec 2007)
Log Message:
-----------
Added logg addon [mingw and unix]
Modified Paths:
--------------
allegro/branches/4.3.10plus/configure.in
allegro/branches/4.3.10plus/docs/src/readme._tx
allegro/branches/4.3.10plus/fix.bat
allegro/branches/4.3.10plus/fix.sh
allegro/branches/4.3.10plus/makefile.all
allegro/branches/4.3.10plus/makefile.in
Added Paths:
-----------
allegro/branches/4.3.10plus/addons/logg/
allegro/branches/4.3.10plus/addons/logg/LICENSE.TXT
allegro/branches/4.3.10plus/addons/logg/Makefile
allegro/branches/4.3.10plus/addons/logg/Makefile.add
allegro/branches/4.3.10plus/addons/logg/Makefile.mingw
allegro/branches/4.3.10plus/addons/logg/Makefile.unix
allegro/branches/4.3.10plus/addons/logg/fix.bat
allegro/branches/4.3.10plus/addons/logg/fix.sh
allegro/branches/4.3.10plus/addons/logg/logg.c
allegro/branches/4.3.10plus/addons/logg/play_ogg.c
allegro/branches/4.3.10plus/addons/logg/stream_ogg.c
Added: allegro/branches/4.3.10plus/addons/logg/LICENSE.TXT
===================================================================
--- allegro/branches/4.3.10plus/addons/logg/LICENSE.TXT (rev 0)
+++ allegro/branches/4.3.10plus/addons/logg/LICENSE.TXT 2007-12-31 19:24:17 UTC (rev 9755)
@@ -0,0 +1,22 @@
+Copyright (c) 2007 Trent Gamblin
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
Added: allegro/branches/4.3.10plus/addons/logg/Makefile
===================================================================
--- allegro/branches/4.3.10plus/addons/logg/Makefile (rev 0)
+++ allegro/branches/4.3.10plus/addons/logg/Makefile 2007-12-31 19:24:17 UTC (rev 9755)
@@ -0,0 +1,2 @@
+# generated by fix.sh
+include Makefile.unix
Added: allegro/branches/4.3.10plus/addons/logg/Makefile.add
===================================================================
--- allegro/branches/4.3.10plus/addons/logg/Makefile.add (rev 0)
+++ allegro/branches/4.3.10plus/addons/logg/Makefile.add 2007-12-31 19:24:17 UTC (rev 9755)
@@ -0,0 +1,30 @@
+# makefile that is included into allegro's main makefile
+#
+
+ADDONS_LIST += logg
+ADDON_INSTALL_TARGETS += logg_install
+ADDON_UNINSTALL_TARGETS += logg_uninstall
+ADDON_CLEAN_TARGETS += logg_clean
+ADDON_DISTCLEAN_TARGETS += logg_veryclean
+ADDON_VERYCLEAN_TARGETS += logg_veryclean
+ADDON_LIB_TARGETS += logg_lib
+ADDON_EXE_TARGETS += logg_programs
+
+logg_lib:
+ $(MAKE) -C addons/logg/ lib
+
+logg_install:
+ $(MAKE) -C addons/logg/ install
+
+logg_clean:
+ $(MAKE) -C addons/logg/ clean
+
+logg_veryclean:
+ $(MAKE) -C addons/logg/ veryclean
+
+logg_uninstall:
+ $(MAKE) -C addons/logg/ uninstall
+
+logg_programs:
+ $(MAKE) -C addons/logg/ examples
+
Added: allegro/branches/4.3.10plus/addons/logg/Makefile.mingw
===================================================================
--- allegro/branches/4.3.10plus/addons/logg/Makefile.mingw (rev 0)
+++ allegro/branches/4.3.10plus/addons/logg/Makefile.mingw 2007-12-31 19:24:17 UTC (rev 9755)
@@ -0,0 +1,71 @@
+include ../../makefile.inf
+
+CC=gcc
+PREFIX=$(MINGDIR)
+LIBS=-L. -L../../lib -llogg -lvorbisfile -lvorbis -logg -l$(ALLEG_LIB_BASENAME)
+
+CFLAGS=-O2 -g0 -I../../include
+ifdef STATICLINK
+ CFLAGS+=-DALLEGRO_STATICLINK
+ LIBS+=-lkernel32 -luser32 -lgdi32 -lcomdlg32 -lole32 -ldinput -lddraw -ldxguid -lwinmm -ldsound
+endif
+
+ifeq ($(TERM), cygwin)
+ UNIX_TOOLS=1
+else
+ ifeq ($(findstring /sh.exe, $(SHELL)), /sh.exe)
+ UNIX_TOOLS=1
+ endif
+endif
+
+ifdef UNIX_TOOLS
+ RMFILE := rm -f
+ COPY := cp
+ RS := / # right slash
+ WS := \\ # wrong slash
+else
+ RMFILE := del
+ COPY := copy /Y
+ RS := \\
+ WS := /
+endif
+
+includedir = $(subst $(WS),$(RS),$(PREFIX)/include/)
+libdir = $(subst $(WS),$(RS),$(PREFIX)/lib/)
+
+all: lib play_ogg stream_ogg
+
+lib: logg.o
+ ar rc liblogg.a logg.o
+ ranlib liblogg.a
+
+logg.o: logg.c logg.h
+ $(CC) $(CFLAGS) -c logg.c
+
+play_ogg: play_ogg.c
+ $(CC) $(CFLAGS) play_ogg.c -o play_ogg.exe $(LIBS)
+
+stream_ogg: stream_ogg.c
+ $(CC) $(CFLAGS) stream_ogg.c -o stream_ogg.exe $(LIBS)
+
+clean:
+ - $(RMFILE) logg.o
+
+veryclean: clean
+ - $(RMFILE) liblogg.a
+ - $(RMFILE) play_ogg.exe
+ - $(RMFILE) stream_ogg.exe
+
+install:
+ $(COPY) logg.h $(includedir)
+ $(COPY) liblogg.a $(libdir)
+ @echo -
+ @echo logg is now installed.
+
+uninstall:
+ - $(RMFILE) logg.h $(includedir)logg.h
+ - $(RMFILE) liblogg.a $(libdir)liblogg.a
+ @echo -
+ @echo logg is now uninstalled.
+
+examples: play_ogg stream_ogg
Added: allegro/branches/4.3.10plus/addons/logg/Makefile.unix
===================================================================
--- allegro/branches/4.3.10plus/addons/logg/Makefile.unix (rev 0)
+++ allegro/branches/4.3.10plus/addons/logg/Makefile.unix 2007-12-31 19:24:17 UTC (rev 9755)
@@ -0,0 +1,41 @@
+PREFIX=`../../allegro-config --prefix`
+CC=gcc
+FLAGS=-O2 -g0 `../../allegro-config --cflags` -I../../include
+LFLAGS=-L. -L../../lib/unix -llogg -logg -lvorbis -lvorbisfile `../../allegro-config --libs` -lm
+
+all: lib play_ogg stream_ogg
+
+lib: logg.o
+ ar rc liblogg.a logg.o
+ ranlib liblogg.a
+
+logg.o: logg.c logg.h
+ $(CC) $(FLAGS) -c logg.c
+
+play_ogg: play_ogg.c liblogg.a
+ gcc $(FLAGS) play_ogg.c -o play_ogg $(LFLAGS)
+
+stream_ogg: stream_ogg.c liblogg.a
+ gcc $(FLAGS) stream_ogg.c -o stream_ogg $(LFLAGS)
+
+clean:
+ rm -f logg.o
+
+veryclean: clean
+ rm -f liblogg.a
+ rm -f play_ogg
+ rm -f stream_ogg
+
+install:
+ cp -f logg.h $(PREFIX)/include
+ cp -f liblogg.a $(PREFIX)/lib
+ @echo -
+ @echo logg is now installed.
+
+uninstall:
+ rm -f $(PREFIX)/include/logg.h
+ rm -f $(PREFIX)/lib/liblogg.a
+ @echo -
+ @echo logg is now uninstalled.
+
+examples: play_ogg stream_ogg
Added: allegro/branches/4.3.10plus/addons/logg/fix.bat
===================================================================
--- allegro/branches/4.3.10plus/addons/logg/fix.bat (rev 0)
+++ allegro/branches/4.3.10plus/addons/logg/fix.bat 2007-12-31 19:24:17 UTC (rev 9755)
@@ -0,0 +1,27 @@
+@echo off
+
+if [%1] == [mingw] goto mingw
+if [%1] == [mingw32] goto mingw
+if [%1] == [] goto nosup
+
+:help
+echo.
+echo Usage: fix platform
+echo.
+echo Where platform is one of:
+echo mingw32
+echo.
+goto end
+
+:nosup
+echo Platform not supported by logg.
+goto end
+
+:mingw
+echo Configuring logg for Windows/MinGW...
+echo #generated by fix.bat > Makefile
+echo include Makefile.mingw >> Makefile
+goto end
+
+:end
+
Property changes on: allegro/branches/4.3.10plus/addons/logg/fix.bat
___________________________________________________________________
Name: svn:executable
+ *
Added: allegro/branches/4.3.10plus/addons/logg/fix.sh
===================================================================
--- allegro/branches/4.3.10plus/addons/logg/fix.sh (rev 0)
+++ allegro/branches/4.3.10plus/addons/logg/fix.sh 2007-12-31 19:24:17 UTC (rev 9755)
@@ -0,0 +1,112 @@
+#!/bin/sh
+#
+# Sets up the logg package for building with the specified compiler.
+#
+
+proc_help()
+{
+ echo
+ echo "Usage: $0 <platform> [--quick|--dtou|--utod]"
+ echo
+ echo "Where platform is one of: mingw32, unix"
+ echo "The --quick parameter turns off text file conversion, --dtou converts from"
+ echo "DOS/Win32 format to Unix, --utod converts from Unix to DOS/Win32 format."
+ echo "If no parameter is specified --quick is assumed."
+ echo
+
+ AL_NOCONV="1"
+}
+
+proc_fix()
+{
+ echo "Configuring logg for $1 ..."
+
+ echo "# generated by fix.sh" > Makefile
+ echo "include $2" >> Makefile
+}
+
+proc_filelist()
+{
+ # common files.
+ AL_FILELIST=`find . -type f "(" ! -path "*/.*" ")" -a "(" \
+ -name "*.c" -o -name "*.cfg" -o -name "*.cpp" -o -name "*.def" -o \
+ -name "*.h" -o -name "*.hin" -o -name "*.in" -o -name "*.inc" -o \
+ -name "*.m" -o -name "*.m4" -o -name "*.mft" -o -name "*.s" -o \
+ -name "*.rc" -o -name "*.rh" -o -name "*.spec" -o -name "*.pl" -o \
+ -name "*.txt" -o -name "*._tx" -o -name "Makefile*" -o \
+ -name "*.inl" -o -name "configure" -o -name "CHANGES" -o \
+ -name "AUTHORS" -o -name "THANKS" ")" \
+ `
+
+ # touch unix shell scripts?
+ if [ "$1" != "omit_sh" ]; then
+ AL_FILELIST="$AL_FILELIST `find . -type f -name '*.sh'`"
+ fi
+
+ # touch DOS batch files?
+ if [ "$1" != "omit_bat" ]; then
+ AL_FILELIST="$AL_FILELIST `find . -type f -name '*.bat'`"
+ fi
+}
+
+proc_utod()
+{
+ echo "Converting files from Unix to DOS/Win32 ..."
+ proc_filelist "omit_sh"
+ for file in $AL_FILELIST; do
+ if [ "$ALLEGRO_USE_CYGWIN" = "1" ]; then
+ unix2dos "$file"
+ else
+ echo "$file"
+ perl -p -e "s/([^\r]|^)\n/\1\r\n/" "$file" > _tmpfile
+ touch -r "$file" _tmpfile
+ mv _tmpfile "$file"
+ fi
+ done
+}
+
+proc_dtou()
+{
+ echo "Converting files from DOS/Win32 to Unix ..."
+ proc_filelist "omit_bat"
+ for file in $AL_FILELIST; do
+ if [ "$ALLEGRO_USE_CYGWIN" = "1" ]; then
+ dos2unix "$file"
+ else
+ echo "$file"
+ mv "$file" _tmpfile
+ tr -d '\015' < _tmpfile > "$file"
+ touch -r _tmpfile "$file"
+ rm _tmpfile
+ fi
+ done
+ chmod +x *.sh
+ if [ -f configure ]; then
+ chmod +x configure
+ fi
+}
+
+# prepare loadpng for the given platform.
+
+if [ -z "$1" ]; then
+ proc_help
+ exit 0
+fi
+
+case "$1" in
+ "mingw" ) proc_fix "Windows (MinGW)" "Makefile.migw";;
+ "mingw32" ) proc_fix "Windows (MinGW)" "Makefile.migw";;
+ "unix" ) proc_fix "Unix" "Makefile.unix";;
+ "help" ) proc_help;;
+ * ) echo "Platform not supported by logg." ;;
+esac
+
+# convert all text-file line endings.
+
+if [ "$AL_NOCONV" != "1" ]; then
+ case "$2" in
+ "--utod" ) proc_utod "$1";;
+ "--dtou" ) proc_dtou "$1";;
+ esac
+fi
+
Property changes on: allegro/branches/4.3.10plus/addons/logg/fix.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: allegro/branches/4.3.10plus/addons/logg/logg.c
===================================================================
--- allegro/branches/4.3.10plus/addons/logg/logg.c (rev 0)
+++ allegro/branches/4.3.10plus/addons/logg/logg.c 2007-12-31 19:24:17 UTC (rev 9755)
@@ -0,0 +1,253 @@
+#include <string.h>
+
+#include "logg.h"
+
+const int LITTLEENDIAN = 0;
+const int BIGENDIAN = 1;
+
+static int logg_bufsize = 1024*64;
+
+SAMPLE* logg_load(const char* filename)
+{
+ OggVorbis_File ovf;
+ FILE* file;
+ vorbis_info* vi;
+ SAMPLE* samp;
+ int numRead;
+ int offset = 0;
+ int bitstream;
+ char buf[logg_bufsize];
+
+ file = fopen(filename, "rb");
+ if (!file) {
+ snprintf(allegro_error, ALLEGRO_ERROR_SIZE, "Unable to open file: %s", filename);
+ return 0;
+ }
+
+ if (ov_open(file, &ovf, 0, 0) != 0) {
+ strncpy(allegro_error, "ov_open failed.", ALLEGRO_ERROR_SIZE);
+ fclose(file);
+ return 0;
+ }
+
+ vi = ov_info(&ovf, -1);
+
+ samp = (SAMPLE*)malloc(sizeof(SAMPLE));
+ if (!samp) {
+ ov_clear(&ovf);
+ return 0;
+ }
+
+ samp->bits = 16;
+ samp->stereo = vi->channels > 1 ? 1 : 0;
+ samp->freq = vi->rate;
+ samp->priority = 128;
+ samp->len = ov_pcm_total(&ovf, -1);
+ samp->loop_start = 0;
+ samp->loop_end = samp->len;
+ samp->data = malloc(sizeof(unsigned short[samp->len*2]));
+
+ while ((numRead = ov_read(&ovf, buf, logg_bufsize,
+ LITTLEENDIAN, 2, 0, &bitstream)) != 0) {
+ memcpy((unsigned char*)samp->data+offset, buf, numRead);
+ offset += numRead;
+ }
+
+ ov_clear(&ovf);
+
+ return samp;
+}
+
+int logg_get_buffer_size()
+{
+ return logg_bufsize;
+}
+
+void logg_set_buffer_size(int size)
+{
+ ASSERT(size > 0);
+ logg_bufsize = size;
+}
+
+static int logg_open_file_for_streaming(LOGG_Stream* s)
+{
+ FILE* file;
+ vorbis_info* vi;
+
+ file = fopen(s->filename, "rb");
+ if (!file) {
+ snprintf(allegro_error, ALLEGRO_ERROR_SIZE, "Unable to open file: %s", s->filename);
+ return 1;
+ }
+
+ if (ov_open(file, &s->ovf, 0, 0) != 0) {
+ strncpy(allegro_error, "ov_open failed.", ALLEGRO_ERROR_SIZE);
+ fclose(file);
+ return 1;
+ }
+
+ vi = ov_info(&s->ovf, -1);
+
+ s->bits = 16;
+ s->stereo = vi->channels > 1 ? 1 : 0;
+ s->freq = vi->rate;
+ s->len = ov_pcm_total(&s->ovf, -1);
+
+ return 0;
+}
+
+static int read_ogg_data(LOGG_Stream* s)
+{
+ int read = 0;
+ int bitstream;
+
+ int page = s->current_page;
+ s->current_page++;
+ s->current_page %= OGG_PAGES_TO_BUFFER;
+
+ memset(s->buf[page], 0, logg_bufsize);
+
+ while (read < logg_bufsize) {
+ int thisRead = ov_read(&s->ovf, s->buf[page]+read,
+ logg_bufsize-read,
+ LITTLEENDIAN, 2, 0, &bitstream);
+ if (thisRead == 0) {
+ if (s->loop) {
+ ov_clear(&s->ovf);
+ if (logg_open_file_for_streaming(s)) {
+ return -1;
+ }
+ }
+ else {
+ return read;
+ }
+ }
+ read += thisRead;
+ }
+
+ return read;
+}
+
+static int logg_play_stream(LOGG_Stream* s)
+{
+ s->current_page = 0;
+ s->playing_page = -1;
+
+ int len = logg_bufsize / (s->stereo ? 2 : 1)
+ / (s->bits / (sizeof(char)*8));
+
+ s->audio_stream = play_audio_stream(len,
+ s->bits, s->stereo,
+ s->freq, s->volume, s->pan);
+
+ if (!s->audio_stream) {
+ return 1;
+ }
+
+ int i;
+ int j;
+
+ for (i = 0; i < OGG_PAGES_TO_BUFFER; i++) {
+ s->buf[i] = malloc(logg_bufsize);
+ if (!s->buf[i]) {
+ logg_destroy_stream(s);
+ return 1;
+ }
+ if (read_ogg_data(s) < 0) {
+ return 1;
+ }
+ }
+
+ return 0;
+}
+
+LOGG_Stream* logg_get_stream(const char* filename, int volume, int pan, int loop)
+{
+ LOGG_Stream* s = calloc(1, sizeof(LOGG_Stream));
+ if (!s) {
+ return 0;
+ }
+
+ s->filename = strdup(filename);
+
+ if (!s->filename) {
+ free(s);
+ return 0;
+ }
+
+ if (logg_open_file_for_streaming(s)) {
+ logg_destroy_stream(s);
+ return 0;
+ }
+
+ s->volume = volume;
+ s->pan = pan;
+ s->loop = loop;
+
+ if (logg_play_stream(s)) {
+ logg_destroy_stream(s);
+ return 0;
+ }
+
+ return s;
+}
+
+int logg_update_stream(LOGG_Stream* s)
+{
+ unsigned char* data = get_audio_stream_buffer(s->audio_stream);
+
+ if (!data) {
+ if (s->current_page != s->playing_page) {
+ int read = read_ogg_data(s);
+ if (read < logg_bufsize) {
+ return 0;
+ }
+ else {
+ return 1;
+ }
+ }
+ else {
+ return 1;
+ }
+ }
+
+ s->playing_page++;
+ s->playing_page %= OGG_PAGES_TO_BUFFER;
+ memcpy(data, s->buf[s->playing_page], logg_bufsize);
+
+ free_audio_stream_buffer(s->audio_stream);
+
+ return 1;
+}
+
+void logg_stop_stream(LOGG_Stream* s)
+{
+ stop_audio_stream(s->audio_stream);
+ int i;
+ for (i = 0; i < OGG_PAGES_TO_BUFFER; i++) {
+ free(s->buf[i]);
+ s->buf[i] = 0;
+ }
+}
+
+int logg_restart_stream(LOGG_Stream* s)
+{
+ return logg_play_stream(s);
+}
+
+void logg_destroy_stream(LOGG_Stream* s)
+{
+ if (s->audio_stream) {
+ stop_audio_stream(s->audio_stream);
+ }
+ ov_clear(&s->ovf);
+ int i;
+ for (i = 0; i < OGG_PAGES_TO_BUFFER; i++) {
+ if (s->buf[i]) {
+ free(s->buf[i]);
+ }
+ }
+ free(s->filename);
+ free(s);
+}
+
Added: allegro/branches/4.3.10plus/addons/logg/play_ogg.c
===================================================================
--- allegro/branches/4.3.10plus/addons/logg/play_ogg.c (rev 0)
+++ allegro/branches/4.3.10plus/addons/logg/play_ogg.c 2007-12-31 19:24:17 UTC (rev 9755)
@@ -0,0 +1,14 @@
+#include "logg.h"
+
+int main(int argc, char** argv)
+{
+ allegro_init();
+ install_sound(DIGI_AUTODETECT, MIDI_NONE, 0);
+ install_timer();
+ SAMPLE* s = logg_load(argv[1]);
+ int voice = play_sample(s, 255, 128, 1000, 0);
+ rest(s->len*1000/s->freq);
+ destroy_sample(s);
+ return 0;
+}
+END_OF_MAIN()
Added: allegro/branches/4.3.10plus/addons/logg/stream_ogg.c
===================================================================
--- allegro/branches/4.3.10plus/addons/logg/stream_ogg.c (rev 0)
+++ allegro/branches/4.3.10plus/addons/logg/stream_ogg.c 2007-12-31 19:24:17 UTC (rev 9755)
@@ -0,0 +1,21 @@
+#include <stdio.h>
+
+#include "logg.h"
+
+int main(int argc, char** argv)
+{
+ allegro_init();
+ install_sound(DIGI_AUTODETECT, MIDI_NONE, 0);
+ install_timer();
+ LOGG_Stream* s = logg_get_stream(argv[1], 255, 128, 1);
+ if (!s) {
+ printf("Error getting ogg stream.\n");
+ return 1;
+ }
+ while (logg_update_stream(s)) {
+ rest(1);
+ }
+ logg_destroy_stream(s);
+ return 0;
+}
+END_OF_MAIN()
Modified: allegro/branches/4.3.10plus/configure.in
===================================================================
--- allegro/branches/4.3.10plus/configure.in 2007-12-31 18:40:58 UTC (rev 9754)
+++ allegro/branches/4.3.10plus/configure.in 2007-12-31 19:24:17 UTC (rev 9755)
@@ -322,6 +322,7 @@
AC_SUBST(LINK_WITH_STATIC_LIBS)
AC_SUBST(WITH_ALLEGRO_GL)
AC_SUBST(WITH_LOADPNG)
+AC_SUBST(WITH_LOGG)
dnl Which libraries to build (static, shared, normal, debugging, profiling)?
ALLEGRO_LIB_TARGETS=
@@ -789,7 +790,7 @@
dnl With loadpng addon
AC_ARG_ENABLE(loadpng,
-[ --enable-loadpng[=x] build loadpng addon library [default=yes]],
+[ --enable-loadpng[=x] build loadpng addon library [default=yes]],
test "X$enableval" != "Xno" && allegro_with_loadpng=yes,
allegro_with_loadpng=yes)
@@ -814,6 +815,40 @@
AC_MSG_RESULT($allegro_with_loadpng)
+dnl With logg addon
+AC_ARG_ENABLE(logg,
+[ --enable-logg[=x] build logg addon library [default=yes]],
+test "X$enableval" != "Xno" && allegro_with_logg=yes,
+allegro_with_logg=yes)
+
+if test -n "$allegro_with_logg"; then
+ AC_CHECK_LIB(ogg, ogg_sync_init,
+ libogg_here=yes)
+
+ AC_CHECK_LIB(vorbis, vorbis_bitrate_init,
+ libvorbis_here=yes)
+
+ AC_CHECK_LIB(vorbisfile, ov_open,
+ libvorbisfile_here=yes)
+
+ AC_CHECK_HEADER(vorbis/vorbisfile.h, vorbisfile_h_here=y)
+
+ if test -n "$libogg_here" -a -n "$libvorbis_here" -a \
+ -n "$libvorbisfile_here" -a -n "$vorbisfile_h_here"; then
+ _addons="logg $_addons"
+ WITH_LOGG=1
+ else
+ allegro_with_logg=no
+ fi
+else
+ allegro_with_logg=no
+fi
+
+AC_MSG_CHECKING(for logg support)
+AC_MSG_RESULT($allegro_with_logg)
+
+
+
test -z "$_addons" && _addons="none"
Modified: allegro/branches/4.3.10plus/docs/src/readme._tx
===================================================================
--- allegro/branches/4.3.10plus/docs/src/readme._tx 2007-12-31 18:40:58 UTC (rev 9754)
+++ allegro/branches/4.3.10plus/docs/src/readme._tx 2007-12-31 19:24:17 UTC (rev 9755)
@@ -114,6 +114,7 @@
<textblock>
AllegroGL - see docs in addons/allegrogl/docs/html.
loadpng - see docs in addons/loadpng/README
+ logg - see the examples in addons/logg/examples
<endblock>
Modified: allegro/branches/4.3.10plus/fix.bat
===================================================================
--- allegro/branches/4.3.10plus/fix.bat 2007-12-31 18:40:58 UTC (rev 9754)
+++ allegro/branches/4.3.10plus/fix.bat 2007-12-31 19:24:17 UTC (rev 9755)
@@ -181,6 +181,10 @@
call fix.bat %1
cd ..\..\
+cd addons\logg\
+call fix.bat %1
+cd ..\..\
+
echo Done!
:end
Modified: allegro/branches/4.3.10plus/fix.sh
===================================================================
--- allegro/branches/4.3.10plus/fix.sh 2007-12-31 18:40:58 UTC (rev 9754)
+++ allegro/branches/4.3.10plus/fix.sh 2007-12-31 19:24:17 UTC (rev 9755)
@@ -174,5 +174,8 @@
if ! ( cd addons/loadpng && ./fix.sh $1 $2); then
echo "Error occured while executing loadpng's fix.sh!"
fi
+if ! ( cd addons/logg && ./fix.sh $1 $2); then
+ echo "Error occured while executing logg's fix.sh!"
+fi
echo "Done!"
Modified: allegro/branches/4.3.10plus/makefile.all
===================================================================
--- allegro/branches/4.3.10plus/makefile.all 2007-12-31 18:40:58 UTC (rev 9754)
+++ allegro/branches/4.3.10plus/makefile.all 2007-12-31 19:24:17 UTC (rev 9755)
@@ -21,6 +21,7 @@
# Addons:
# WITH_ALLEGRO_GL=1 Enable building of AllegroGL addon.
# WITH_LOADPNG=1 Enable building of loadpng addon.
+# WITH_LOGG=1 Enable building of logg addon.
#
# Targets:
# default: build library version, docs, and programs.
@@ -220,6 +221,10 @@
include addons/loadpng/Makefile.add
endif
+ifdef WITH_LOGG
+ include addons/logg/Makefile.add
+endif
+
ifndef ADDONS_LIST
ADDONS_LIST = "none"
endif
Modified: allegro/branches/4.3.10plus/makefile.in
===================================================================
--- allegro/branches/4.3.10plus/makefile.in 2007-12-31 18:40:58 UTC (rev 9754)
+++ allegro/branches/4.3.10plus/makefile.in 2007-12-31 19:24:17 UTC (rev 9755)
@@ -95,6 +95,7 @@
WITH_ALLEGRO_GL = @WITH_ALLEGRO_GL@
WITH_LOADPNG = @WITH_LOADPNG@
+WITH_LOGG = @WITH_LOGG@
PLUGIN_LIB = @PLUGIN_LIB@
obj_unix_plugins_h = $(OBJDIR)/plugins.h
@@ -132,6 +133,10 @@
include addons/loadpng/Makefile.add
endif
+ifdef WITH_LOGG
+ include addons/logg/Makefile.add
+endif
+
ifndef ADDONS_LIST
ADDONS_LIST = "none"
endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|