Applied build system patch from Erik de Castro Lopo; now builds on MinGW:
authorconrad <conrad@0101bb08-14d6-0310-b084-bc0e0c8e3800>
Sun, 10 Oct 2004 02:38:05 +0000 (02:38 +0000)
committerconrad <conrad@0101bb08-14d6-0310-b084-bc0e0c8e3800>
Sun, 10 Oct 2004 02:38:05 +0000 (02:38 +0000)
* guard src/wave_out.h against multiple includes
* add @OGG_CFLAGS@ to INCLUDES in subdirs

git-svn-id: http://svn.xiph.org/trunk/speex@7951 0101bb08-14d6-0310-b084-bc0e0c8e3800

libspeex/Makefile.am
src/Makefile.am
src/wave_out.h

index 0fa0d57..f9f1a6e 100644 (file)
@@ -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
 
index da59666..6debe05 100644 (file)
@@ -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
index 82eb88b..0c467b1 100644 (file)
@@ -30,6 +30,8 @@
 \r
 //    WAVE_OUT.H - Necessary stuff for WIN_AUDIO\r
 \r
+#ifndef WAVE_OUT_H\r
+#define WAVE_OUT_H\r
 \r
 #include <stdio.h>\r
 #include <windows.h>\r
@@ -66,3 +68,4 @@ Int        Set_WIN_Params             ( FILE_T dummyFile , Ldouble SampleFreq, U
 int        WIN_Play_Samples           ( const void* buff, size_t len );\r
 int        WIN_Audio_close            ( void );\r
 \r
+#endif /* WAVE_OUT_H */\r