From 28321ce9c90d0984c1cc39ae4e9a335aba5e887f Mon Sep 17 00:00:00 2001
From: Lance <moodles@users.sourceforge.net>
Date: Thu, 9 Dec 2010 03:52:48 +0000
Subject: [PATCH] Speex support in MorphOS

git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3689 fc73d0e0-1445-4013-8a0c-d673dee63da5
---
 engine/Makefile                      | 2 +-
 engine/libs/speex/speex.h            | 9 +++++++--
 engine/libs/speex/speex_preprocess.h | 6 +++++-
 engine/libs/speex/speex_types.h      | 9 ++++++++-
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/engine/Makefile b/engine/Makefile
index a4e92858a..11718b1e8 100644
--- a/engine/Makefile
+++ b/engine/Makefile
@@ -839,7 +839,7 @@ ifeq ($(FTE_TARGET),morphos)
 	GL_EXE_NAME=../morphos_fteqw.gl
 	GLCL_EXE_NAME=../morphos_fteqwcl.gl
 	GL_LDFLAGS=$(GLLDFLAGS) -ldl $(IMAGELDFLAGS) -lz
-	GL_CFLAGS=$(GLCFLAGS) -noixemul -I./libs/speex
+	GL_CFLAGS=$(GLCFLAGS) -noixemul -I./libs/speex -I./
 	GLB_DIR=gl_morphos
 	GLCL_DIR=glcl_morphos
 
diff --git a/engine/libs/speex/speex.h b/engine/libs/speex/speex.h
index 82ba01623..4f9aec902 100644
--- a/engine/libs/speex/speex.h
+++ b/engine/libs/speex/speex.h
@@ -40,8 +40,13 @@
  *  @{
  */
 
-#include "speex/speex_bits.h"
-#include "speex/speex_types.h"
+#ifndef __MORPHOS__
+	#include "speex/speex_bits.h"
+	#include "speex/speex_types.h"
+#else
+	#include <speex_bits.h>
+	#include <speex_types.h>
+#endif
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/engine/libs/speex/speex_preprocess.h b/engine/libs/speex/speex_preprocess.h
index a0d3aa3dc..67157b7a2 100644
--- a/engine/libs/speex/speex_preprocess.h
+++ b/engine/libs/speex/speex_preprocess.h
@@ -43,7 +43,11 @@
  *  @{
  */
 
-#include "speex/speex_types.h"
+#ifndef __MORPHOS__
+	#include "speex/speex_types.h"
+#else
+	#include <speex_types.h>
+#endif
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/engine/libs/speex/speex_types.h b/engine/libs/speex/speex_types.h
index 852fed801..fbe47a439 100644
--- a/engine/libs/speex/speex_types.h
+++ b/engine/libs/speex/speex_types.h
@@ -65,7 +65,6 @@
    typedef u_int32_t spx_uint32_t;
 
 #elif defined(__BEOS__)
-
    /* Be */
 #  include <inttypes.h>
    typedef int16_t spx_int16_t;
@@ -88,6 +87,14 @@
    typedef int spx_int32_t;
    typedef unsigned int spx_uint32_t;
 
+#elif defined(__MORPHOS__)
+
+#  include <sys/types.h>
+   typedef int16_t spx_int16_t;
+   typedef u_int16_t spx_uint16_t;
+   typedef int32_t spx_int32_t;
+   typedef u_int32_t spx_uint32_t;
+
 #elif defined(R5900)
 
    /* PS2 EE */