From 30c2bedb30cc6bcbbc49c4c243673feff9742be2 Mon Sep 17 00:00:00 2001
From: Thorvald Natvig <slicer@users.sourceforge.net>
Date: Wed, 31 May 2006 14:36:12 +0000
Subject: [PATCH] Compiles on Linux again

git-svn-id: https://mumble.svn.sourceforge.net/svnroot/mumble/trunk@349 05730e5d-ab1b-0410-a4ac-84af385074fa
---
 AudioStats.cpp | 4 ++--
 mumble.pro     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/AudioStats.cpp b/AudioStats.cpp
index ed633dd5d..2c663e680 100644
--- a/AudioStats.cpp
+++ b/AudioStats.cpp
@@ -40,7 +40,7 @@ typedef float spx_word32_t;
 typedef float spx_float_t;
 typedef spx_word32_t spx_mem_t;
 /** Speex echo cancellation state. */
-struct SpeexEchoState {
+struct CloneSpeexEchoState {
    int frame_size;           /**< Number of samples processed each time */
    int window_size;
    int M;
@@ -145,7 +145,7 @@ void AudioEchoWidget::paintGL() {
 	if (! ai || ! ai->sesEcho)
 		return;
 
-	SpeexEchoState *st = ai->sesEcho;
+	CloneSpeexEchoState *st = reinterpret_cast<CloneSpeexEchoState *>(ai->sesEcho);
 
     int N = st->window_size;
     int n = N / 2;
diff --git a/mumble.pro b/mumble.pro
index 85ef092ad..3f23a63e2 100644
--- a/mumble.pro
+++ b/mumble.pro
@@ -29,8 +29,8 @@ win32 {
 
 unix {
   SOURCES	+= GlobalShortcut_unix.cpp TextToSpeech_unix.cpp TrayIcon_unix.cpp
-  INCLUDEPATH	+= .. fmod/api/inc /usr/local/include
-  LIBS		+= -Lfmod/api/lib -lfmodex -L/usr/local/lib
+  INCLUDEPATH	+= fmod/api/inc /usr/local/include ../speex/include
+  LIBS		+= -Lfmod/api/lib -lfmodex -L/usr/local/lib -L../speex/lib
 }
 
 CONFIG(asio) {