Seems there were a few things I forgot when I removed FMod. Should be about it

diff --git a/Source/Globals.cpp b/Source/Globals.cpp
index fe9c136c58af36faf85817ed2abb606ea83c8822..be2a006d633eddc0f4f4d18a061bbe90d8125596 100644 (file)
--- a/Source/Globals.cpp
+++ b/Source/Globals.cpp
@@ -27,7 +27,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "Quaternions.h"
 #include "Lights.h"
 #include "Skeleton.h"
-#include "fmod.h"
 #include "Terrain.h"
 #include "Sprites.h"
 #include "Frustum.h"

diff --git a/Source/OpenGL_Windows.cpp b/Source/OpenGL_Windows.cpp
index 1ee4964f94c8182969e026bbb9548276c25ac75c..9374b1f8f41d4acbdd1594b4248cd2deecd4e1a7 100644 (file)
--- a/Source/OpenGL_Windows.cpp
+++ b/Source/OpenGL_Windows.cpp
@@ -127,8 +127,6 @@ extern float volume;
 #include <shellapi.h>
 #endif
 
-#include "fmod.h"
-
 #include "res/resource.h"
 
 using namespace std;

diff --git a/Source/Person.h b/Source/Person.h
index ae7390f44a0172a7d345a317def7c9488ec6566b..cde2f8f7a93b2b16d6e76b346f1296fbb844b597 100644 (file)
--- a/Source/Person.h
+++ b/Source/Person.h
@@ -26,7 +26,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "gamegl.h"
 #include "Quaternions.h"
-#include "fmod.h"
 #include "Skeleton.h"
 #include "Models.h"
 #include "Constants.h"

diff --git a/Source/Skeleton.h b/Source/Skeleton.h
index 4e3a3fc3f49263618b0c7a70ecd7b3934c4257cf..2948b1f8a1d5c6d1307a9073f8d9d4ebe755fb65 100644 (file)
--- a/Source/Skeleton.h
+++ b/Source/Skeleton.h
@@ -30,7 +30,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 /**> HEADER FILES <**/
 #include "gamegl.h"
 #include "Quaternions.h"
-#include "fmod.h"
 #include "Objects.h"
 #include "Sprites.h"
 #include "binio.h"

diff --git a/Source/fmod.h b/Source/fmod.h
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/Source/fmod_header.h b/Source/fmod_header.h
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/Source/openal_wrapper.h b/Source/openal_wrapper.h
index f31c6c081277da807afc713ab0b9db4080c62e43..2b323428cacc211ac6dc445979ff1a454e12f942 100644 (file)
--- a/Source/openal_wrapper.h
+++ b/Source/openal_wrapper.h
@@ -101,8 +101,8 @@ AL_API signed char OPENAL_SetOutput(int outputtype);
 #  define OPENAL_Sample_LoadEx(a, b, c, d, e) OPENAL_Sample_Load( a, ConvertFileName( b), c, d, e)
 #  define OPENAL_Stream_OpenEx(a, b, c, d) OPENAL_Stream_Open(ConvertFileName(a), b, c, d)
 #elif !PLATFORM_MACOSX
-#  define OPENAL_Sample_LoadEx(a, b, c, d, e) FSOUND_Sample_Load( a, ConvertFileName( b), c, d, e)
-#  define OPENAL_Stream_OpenEx(a, b, c, d) FSOUND_Stream_Open(ConvertFileName(a), b, c, d)
+#  define OPENAL_Sample_LoadEx(a, b, c, d, e) OPENAL_Sample_Load( a, ConvertFileName( b), c, d, e)
+#  define OPENAL_Stream_OpenEx(a, b, c, d) OPENAL_Stream_Open(ConvertFileName(a), b, c, d)
 #endif
 
 #endif