[xiph-commits] r7951 - in trunk/speex: libspeex src

[conrad at motherfish-iii.xiph.org]

Author: conrad
Date: 2004-10-09 19:38:05 -0700 (Sat, 09 Oct 2004)
New Revision: 7951

Modified:
   trunk/speex/libspeex/Makefile.am
   trunk/speex/src/Makefile.am
   trunk/speex/src/wave_out.h
Log:
Applied build system patch from Erik de Castro Lopo; now builds on MinGW:
	* guard src/wave_out.h against multiple includes
	* add @OGG_CFLAGS@ to INCLUDES in subdirs


Modified: trunk/speex/libspeex/Makefile.am
===================================================================
--- trunk/speex/libspeex/Makefile.am	2004-10-09 17:01:31 UTC (rev 7950)
+++ trunk/speex/libspeex/Makefile.am	2004-10-10 02:38:05 UTC (rev 7951)
@@ -4,7 +4,7 @@
 
 EXTRA_DIST=testenc.c testenc_wb.c testenc_uwb.c testdenoise.c testecho.c
 
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/include @OGG_CFLAGS@
 
 lib_LTLIBRARIES = libspeex.la
 

Modified: trunk/speex/src/Makefile.am
===================================================================
--- trunk/speex/src/Makefile.am	2004-10-09 17:01:31 UTC (rev 7950)
+++ trunk/speex/src/Makefile.am	2004-10-10 02:38:05 UTC (rev 7951)
@@ -5,7 +5,7 @@
 # Disable automatic dependency tracking if using other tools than gcc and gmake
 #AUTOMAKE_OPTIONS = no-dependencies
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/libspeex $(OGG_CFLAGS)
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/libspeex @OGG_CFLAGS@
 
 mandir = $(prefix)/share/man
 man_MANS = speexenc.1 speexdec.1

Modified: trunk/speex/src/wave_out.h
===================================================================
--- trunk/speex/src/wave_out.h	2004-10-09 17:01:31 UTC (rev 7950)
+++ trunk/speex/src/wave_out.h	2004-10-10 02:38:05 UTC (rev 7951)
@@ -30,6 +30,8 @@
 
 //    WAVE_OUT.H - Necessary stuff for WIN_AUDIO
 
+#ifndef WAVE_OUT_H
+#define WAVE_OUT_H
 
 #include <stdio.h>
 #include <windows.h>
@@ -66,3 +68,4 @@
 int        WIN_Play_Samples           ( const void* buff, size_t len );
 int        WIN_Audio_close            ( void );
 
+#endif /* WAVE_OUT_H */