[vorbis-dev] Beos diffs

[David Burnett]

I've included a couple of ogg and vorbis diffs to fix the broken BeOS build
that crept in while a was busy doing other stuff :)

The ogg one is necessary for libogg to build on beos and should not 
affect any other build.

The vorbis one allows building on BeOS direct from CVS and
will affect builds in so much that the makefiles will be constructed differently
but hopefully not break them (it didn't break the linux build when I tested it
but that was a while ago). 

Dave

? ogg.diff
Index: include/ogg/os_types.h
===================================================================
RCS file: /usr/local/cvsroot/ogg/include/ogg/os_types.h,v
retrieving revision 1.7
diff -u -r1.7 os_types.h
--- include/ogg/os_types.h	2001/06/03 03:09:18	1.7
+++ include/ogg/os_types.h	2001/06/21 17:22:27
@@ -52,7 +52,10 @@
 #elif defined(__BEOS__)
 
    /* Be */
-#  include <inttypes.h>
+   typedef short ogg_int16_t;
+   typedef int ogg_int32_t;
+   typedef unsigned int ogg_uint32_t;
+   typedef long long ogg_int64_t;
 
 #elif defined (__EMX__)
 

-----------------------------SNIP----------------

? vorbis.diff
Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/vorbis/configure.in,v
retrieving revision 1.40
diff -u -r1.40 configure.in
--- configure.in	2001/06/18 00:20:18	1.40
+++ configure.in	2001/06/21 17:21:31
@@ -131,6 +131,11 @@
                 DEBUG="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O0 -fsigned-char"
                 CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O4 -ffast-math -fsigned-char"
                 PROFILE="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -pg -O4 -ffast-math -fsigned-char";;
+	*beos)
+		LIB_VORBIS="libvorbis.la"
+		DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
+		CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char"
+		PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;;
         *)
                 DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
                 CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char"
@@ -183,6 +188,7 @@
 
 AC_SUBST(DEBUG)
 AC_SUBST(PROFILE)
+AC_SUBST(LIB_VORBIS)
 AC_SUBST(pthread_lib)
 
 AC_OUTPUT(Makefile lib/Makefile lib/modes/Makefile lib/books/Makefile doc/Makefile doc/vorbisfile/Makefile doc/vorbisenc/Makefile include/Makefile include/vorbis/Makefile examples/Makefile win32/Makefile debian/Makefile vq/Makefile)
Index: lib/Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/Makefile.am,v
retrieving revision 1.12
diff -u -r1.12 Makefile.am
--- lib/Makefile.am	2001/05/27 06:43:59	1.12
+++ lib/Makefile.am	2001/06/21 17:21:32
@@ -21,9 +21,11 @@
 
 libvorbisfile_la_SOURCES = vorbisfile.c
 libvorbisfile_la_LDFLAGS = -version-info @VF_LIB_CURRENT@:@VF_LIB_REVISION@:@VF_LIB_AGE@
+libvorbisfile_la_LIBADD = @LIB_VORBIS@
 
 libvorbisenc_la_SOURCES = vorbisenc.c
 libvorbisenc_la_LDFLAGS = -version-info @VE_LIB_CURRENT@:@VE_LIB_REVISION@:@VE_LIB_AGE@
+libvorbisenc_la_LIBADD = @LIB_VORBIS@ 
 
 EXTRA_PROGRAMS = barkmel tone psytune
 CLEANFILES = $(EXTRA_PROGRAMS)

--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'vorbis-dev-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.