Merge branch 'master' into build

This commit is contained in:
Reece Dunn
2011-03-14 22:39:19 +00:00
130 changed files with 4808 additions and 1934 deletions
+4 -1
View File
@@ -20,6 +20,9 @@
// Windows command-line version of eSpeak
#ifndef SPEECH_H
#define SPEECH_H
// conditional compilation options
@@ -31,7 +34,6 @@
#define PATHSEP '\\'
#define USE_PORTAUDIO
#define NO_VARIADIC_MACROS
#define ESPEAK_API
#define INCLUDE_KLATT
#define INCLUDE_MBROLA
@@ -61,3 +63,4 @@ int GetFileLength(const char *filename);
char *Alloc(int size);
void Free(void *ptr);
#endif // SPEECH_H