[#18260] FMOD Removal

from Jorg Muller (nexyon)

also removed references to CVS in install

24 files changed, 6 insertions, 188 deletions

diff --git a/config/darwin-config.py b/config/darwin-config.py
index 39c9b9df4ff..04a44372383 100644
--- a/config/darwin-config.py
+++ b/config/darwin-config.py
@@ -106,9 +106,6 @@ BF_SDL_INC = '${BF_SDL}/include' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
 BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
 BF_SDL_LIBPATH = '${BF_SDL}/lib'
 
-WITH_BF_FMOD = False
-BF_FMOD = LIBDIR + '/fmod'
-
 WITH_BF_OPENEXR = True
 WITH_BF_STATICOPENEXR = False
 BF_OPENEXR = '${LCGDIR}/openexr'
diff --git a/config/irix6-config.py b/config/irix6-config.py
index 8be12d649bf..2c57a2bba8a 100644
--- a/config/irix6-config.py
+++ b/config/irix6-config.py
@@ -39,9 +39,6 @@ BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
 BF_SDL_LIB = 'SDL audio iconv charset' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
 BF_SDL_LIBPATH = '${BF_SDL}/lib'
 
-WITH_BF_FMOD = 'false'
-BF_FMOD = LIBDIR + '/fmod'
-
 WITH_BF_OPENEXR = 'false'
 WITH_BF_STATICOPENEXR = 'false'
 BF_OPENEXR = '/usr'
diff --git a/config/linux2-config.py b/config/linux2-config.py
index 102bb2e5e4c..b2f4066e0ed 100644
--- a/config/linux2-config.py
+++ b/config/linux2-config.py
@@ -34,9 +34,6 @@ BF_SDL = '/usr' #$(shell sdl-config --prefix)
 BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
 BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
 
-WITH_BF_FMOD = False
-BF_FMOD = LIBDIR + '/fmod'
-
 WITH_BF_OPENEXR = True
 WITH_BF_STATICOPENEXR = False
 BF_OPENEXR = '/usr'
diff --git a/config/linuxcross-config.py b/config/linuxcross-config.py
index 5981c8b96e5..ac9e8bc23a5 100644
--- a/config/linuxcross-config.py
+++ b/config/linuxcross-config.py
@@ -38,9 +38,6 @@ BF_PTHREADS_INC = '${BF_PTHREADS}/include'
 BF_PTHREADS_LIB = 'pthreadGC2'
 BF_PTHREADS_LIBPATH = '${BF_PTHREADS}/lib'
 
-WITH_BF_FMOD = False
-BF_FMOD = LIBDIR + '/fmod'
-
 WITH_BF_OPENEXR = True
 WITH_BF_STATICOPENEXR = False
 BF_OPENEXR = LIBDIR + '/gcc/openexr'
diff --git a/config/openbsd3-config.py b/config/openbsd3-config.py
index 8fc334874f9..3a36f8df663 100644
--- a/config/openbsd3-config.py
+++ b/config/openbsd3-config.py
@@ -22,9 +22,6 @@ BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
 BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
 BF_SDL_LIBPATH = '${BF_SDL}/lib'
 
-WITH_BF_FMOD = False
-BF_FMOD = LIBDIR + '/fmod'
-
 WITH_BF_OPENEXR = False
 WITH_BF_STATICOPENEXR = False
 BF_OPENEXR = '/usr/local'
diff --git a/config/sunos5-config.py b/config/sunos5-config.py
index dda7d0ff2f3..6fa9529e1cd 100644
--- a/config/sunos5-config.py
+++ b/config/sunos5-config.py
@@ -28,9 +28,6 @@ BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
 BF_SDL_LIBPATH = '${BF_SDL}/lib'
 BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
 
-WITH_BF_FMOD = False
-BF_FMOD = LIBDIR + '/fmod'
-
 WITH_BF_OPENEXR = True
 WITH_BF_STATICOPENEXR = False
 BF_OPENEXR = '/usr/local'
diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py
index b94747637e9..a102c423fb5 100644
--- a/config/win32-mingw-config.py
+++ b/config/win32-mingw-config.py
@@ -38,9 +38,6 @@ BF_PTHREADS_INC = '${BF_PTHREADS}/include'
 BF_PTHREADS_LIB = 'pthreadGC2'
 BF_PTHREADS_LIBPATH = '${BF_PTHREADS}/lib'
 
-WITH_BF_FMOD = False
-BF_FMOD = LIBDIR + '/fmod'
-
 WITH_BF_OPENEXR = True
 WITH_BF_STATICOPENEXR = False
 BF_OPENEXR = LIBDIR + '/gcc/openexr'
diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py
index d4e9fa9b30e..6e56af2d95e 100644
--- a/config/win32-vc-config.py
+++ b/config/win32-vc-config.py
@@ -49,9 +49,6 @@ BF_PTHREADS_INC = '${BF_PTHREADS}/include'
 BF_PTHREADS_LIB = 'pthreadVC2'
 BF_PTHREADS_LIBPATH = '${BF_PTHREADS}/lib'
 
-WITH_BF_FMOD = False
-BF_FMOD = LIBDIR + '/fmod'
-
 WITH_BF_OPENEXR = True
 WITH_BF_STATICOPENEXR = False
 BF_OPENEXR = LIBDIR + '/openexr'
diff --git a/intern/SoundSystem/Makefile b/intern/SoundSystem/Makefile
index 051e2643a87..4e5a8363955 100644
--- a/intern/SoundSystem/Makefile
+++ b/intern/SoundSystem/Makefile
@@ -38,7 +38,6 @@ DIRS += dummy
 
 ifneq ($(NAN_NO_OPENAL),true)
   ifeq ($(OS),windows)
-      DIRS += fmod 
       DIRS += openal sdl
   endif
   ifeq ($(OS),darwin)
diff --git a/intern/SoundSystem/SND_DependKludge.h b/intern/SoundSystem/SND_DependKludge.h
index 1a95f977abe..06d4ec9c0c9 100644
--- a/intern/SoundSystem/SND_DependKludge.h
+++ b/intern/SoundSystem/SND_DependKludge.h
@@ -43,9 +43,6 @@
 #	ifdef USE_OPENAL
 #		undef USE_OPENAL
 #	endif
-#	ifdef USE_FMOD
-#		undef USE_FMOD
-#	endif
 #endif
 
 #endif /* NO_SOUND */
diff --git a/intern/SoundSystem/SoundDefines.h b/intern/SoundSystem/SoundDefines.h
index 450fde187b5..5238507c866 100644
--- a/intern/SoundSystem/SoundDefines.h
+++ b/intern/SoundSystem/SoundDefines.h
@@ -38,7 +38,6 @@
 enum
 {
 	snd_e_dummydevice = 0,
-	snd_e_fmoddevice,
 	snd_e_openaldevice
 };
 
@@ -49,15 +48,6 @@ enum
 /* openal related stuff */
 #define AL_LOOPING						0x1007
 
-/* fmod related stuff */
-#ifdef WIN32
-#define MIXRATE							22050
-#else
-#define MIXRATE							44100
-#endif
-#define NUM_FMOD_MIN_HW_CHANNELS		16
-#define NUM_FMOD_MAX_HW_CHANNELS		16
-
 /* activelist defines */
 enum
 {
diff --git a/intern/SoundSystem/dummy/SND_DummyDevice.cpp b/intern/SoundSystem/dummy/SND_DummyDevice.cpp
index 3e5874f02ca..672c73e9c52 100644
--- a/intern/SoundSystem/dummy/SND_DummyDevice.cpp
+++ b/intern/SoundSystem/dummy/SND_DummyDevice.cpp
@@ -25,7 +25,7 @@
  * Contributor(s): none yet.
  *
  * ***** END GPL LICENSE BLOCK *****
- * SND_FmodDevice derived from SND_IAudioDevice
+ * SND_DummyDevice derived from SND_IAudioDevice
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/intern/SoundSystem/intern/Makefile b/intern/SoundSystem/intern/Makefile
index c52be01f69f..7684b6b0bca 100644
--- a/intern/SoundSystem/intern/Makefile
+++ b/intern/SoundSystem/intern/Makefile
@@ -35,12 +35,10 @@ include nan_compile.mk
 
 CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
 
-CPPFLAGS += -I$(NAN_FMOD)/include    
 CPPFLAGS += -I$(NAN_STRING)/include    
 CPPFLAGS += -I$(NAN_MOTO)/include
 CPPFLAGS += -I../../../source/blender/include
 CPPFLAGS += -I../dummy
-CPPFLAGS += -I../fmod
 CPPFLAGS += -I../openal
 CPPFLAGS += -I..
 CPPFLAGS += -I.
diff --git a/intern/SoundSystem/intern/SND_DeviceManager.cpp b/intern/SoundSystem/intern/SND_DeviceManager.cpp
index 215c0f5b6fa..c4bc887dffe 100644
--- a/intern/SoundSystem/intern/SND_DeviceManager.cpp
+++ b/intern/SoundSystem/intern/SND_DeviceManager.cpp
@@ -38,9 +38,6 @@
 #include "SND_DeviceManager.h"
 #include "SND_DependKludge.h"
 #include "SND_DummyDevice.h"
-#ifdef USE_FMOD
-#include "SND_FmodDevice.h"
-#endif
 #ifdef USE_OPENAL
 #include "SND_OpenALDevice.h"
 #endif
@@ -51,11 +48,7 @@ int SND_DeviceManager::m_subscriptions = 0;
 #ifdef USE_OPENAL
 int SND_DeviceManager::m_device_type = snd_e_openaldevice;
 #else
-#	ifdef USE_FMOD
-int SND_DeviceManager::m_device_type = snd_e_fmoddevice;
-#	else
 int SND_DeviceManager::m_device_type = snd_e_dummydevice;
-#	endif
 #endif
 
 void SND_DeviceManager::Subscribe()
@@ -115,14 +108,6 @@ void SND_DeviceManager::SetDeviceType(int device_type)
 	// let's create the chosen device
 	switch (device_type)
 	{
-#ifdef USE_FMOD
-	case snd_e_fmoddevice:
-		{
-			m_instance = new SND_FmodDevice();
-			m_device_type = device_type;
-			break;
-		}
-#endif
 #ifdef USE_OPENAL
 	case snd_e_openaldevice:
 		{
diff --git a/intern/SoundSystem/intern/SND_Scene.cpp b/intern/SoundSystem/intern/SND_Scene.cpp
index 9d050a81161..af1b43a08aa 100644
--- a/intern/SoundSystem/intern/SND_Scene.cpp
+++ b/intern/SoundSystem/intern/SND_Scene.cpp
@@ -217,14 +217,8 @@ void SND_Scene::UpdateListener()
 	if (m_listener.IsModified())
 	{
 		m_audiodevice->SetListenerGain(m_listener.GetGain());
-		
-		// fmod doesn't support dopplervelocity, so just use the dopplerfactor instead
-#ifdef USE_FMOD
-		m_audiodevice->SetDopplerFactor(m_listener.GetDopplerVelocity());
-#else
 		m_audiodevice->SetDopplerVelocity(m_listener.GetDopplerVelocity());
 		m_audiodevice->SetDopplerFactor(m_listener.GetDopplerFactor());
-#endif
 		m_listener.SetModified(false);
 	}
 }
@@ -304,23 +298,6 @@ void SND_Scene::UpdateActiveObects()
 		
 		if (id >= 0)
 		{
-#ifdef USE_FMOD
-			// fmod wants these set before playing the sample
-			if (pObject->IsModified())
-			{
-				m_audiodevice->SetObjectLoop(id, pObject->GetLoopMode());
-				m_audiodevice->SetObjectLoopPoints(id, pObject->GetLoopStart(), pObject->GetLoopEnd());
-			}
-
-			// ok, properties Set. now see if it must play
-			if (pObject->GetPlaystate() == SND_MUST_PLAY)
-			{
-				m_audiodevice->PlayObject(id);
-				pObject->SetPlaystate(SND_PLAYING);
-				pObject->InitRunning();
-//				printf("start play: %d\n", tijd);
-			}
-#endif
 			if (pObject->Is3D())
 			{
 				// Get the global positions and velocity vectors
diff --git a/intern/SoundSystem/intern/SND_Utils.cpp b/intern/SoundSystem/intern/SND_Utils.cpp
index 26ce106a24e..7890d2a3d63 100644
--- a/intern/SoundSystem/intern/SND_Utils.cpp
+++ b/intern/SoundSystem/intern/SND_Utils.cpp
@@ -158,39 +158,7 @@ bool SND_IsSampleValid(const STR_String& name, void* memlocation)
 
 			if (shortbuf == SND_WAVE_FORMAT_PCM)
 				result = true;
-			
-			/* only fmod supports compressed wav */
-#ifdef USE_FMOD
-			switch (shortbuf)
-			{
-				case SND_WAVE_FORMAT_ADPCM:
-				case SND_WAVE_FORMAT_ALAW:
-				case SND_WAVE_FORMAT_MULAW:
-				case SND_WAVE_FORMAT_DIALOGIC_OKI_ADPCM:
-				case SND_WAVE_FORMAT_CONTROL_RES_VQLPC:
-				case SND_WAVE_FORMAT_GSM_610:
-				case SND_WAVE_FORMAT_MPEG3:
-					result = true;
-					break;
-				default:
-					{
-						break;
-					}
-			}
-#endif
 		}
-#ifdef USE_FMOD
-		/* only valid publishers may use ogg vorbis */
-		else if (!memcmp(buffer, "OggS", 4))
-		{
-			result = true;
-		}
-		/* only valid publishers may use mp3 */
-		else if (((!memcmp(buffer, "ID3", 3)) || (!memcmp(buffer, "ÿû", 2))))
-		{
-			result = true;
-		}
-#endif
 	}
 	if (loadedsample)
 	{
diff --git a/intern/SoundSystem/openal/SND_OpenALDevice.cpp b/intern/SoundSystem/openal/SND_OpenALDevice.cpp
index 9ce30f985ac..3649cf6de5a 100644
--- a/intern/SoundSystem/openal/SND_OpenALDevice.cpp
+++ b/intern/SoundSystem/openal/SND_OpenALDevice.cpp
@@ -316,7 +316,7 @@ SND_OpenALDevice::SND_OpenALDevice()
 
 void SND_OpenALDevice::UseCD(void) const
 {
-	// only fmod has CD support, so only create it here
+	// we use SDL for CD, so we create the system
 	SND_CDObject::CreateSystem();
 
 }
diff --git a/release/windows/specific.sh b/release/windows/specific.sh
index e3ecfcb959f..5df90869914 100755
--- a/release/windows/specific.sh
+++ b/release/windows/specific.sh
@@ -60,10 +60,6 @@ chmod +x $DISTDIR/python$PVERS.dll
 #Add pthreads dll to package
 cp -f $NAN_PTHREADS/lib/pthreadGC2.dll $DISTDIR/pthreadGC2.dll
 
-# Add fmod DLL to package
-# cp -f $NAN_FMOD/lib/fmod.dll $DISTDIR/fmod.dll
-# chmod +x $DISTDIR/fmod.dll
-
 # Add gettext DLL to package
 cp -f $NAN_GETTEXT/lib/gnu_gettext.dll $DISTDIR/gnu_gettext.dll
 
diff --git a/source/Makefile b/source/Makefile
index 239ca9e0d1b..d8dee601998 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -337,7 +337,7 @@ ifeq ($(OS),solaris)
     SPLIB += $(NAN_ZLIB)/lib/libz.a
 endif
 
-# OpenAL libs are already compiled as shared code! Check FMod if we switch to that. (nzc)
+# OpenAL libs are already compiled as shared code!
 
 # Some vars to keep the rest of this section mostly readable
 # in an 80 char term
diff --git a/source/blender/include/BIF_editsound.h b/source/blender/include/BIF_editsound.h
index 6561b3e6849..e04bd43307e 100644
--- a/source/blender/include/BIF_editsound.h
+++ b/source/blender/include/BIF_editsound.h
@@ -39,7 +39,6 @@ struct hdaudio;
 void sound_init_audio(void);
 void sound_initialize_sounds(void);
 void sound_exit_audio(void);
-int sound_get_mixrate(void);
 
 void* sound_get_audiodevice(void);
 void* sound_get_listener(void);
diff --git a/source/blender/src/buttons_scene.c b/source/blender/src/buttons_scene.c
index be988c5a68a..aa072285556 100644
--- a/source/blender/src/buttons_scene.c
+++ b/source/blender/src/buttons_scene.c
@@ -296,17 +296,11 @@ void do_soundbuts(unsigned short event)
 static void sound_panel_listener(void)
 {
 	uiBlock *block;
-	int xco= 100, yco=100, mixrate;
-	char mixrateinfo[256];
+	int xco= 100, yco=100;
 	
 	block= uiNewBlock(&curarea->uiblocks, "sound_panel_listener", UI_EMBOSS, UI_HELV, curarea->win);
 	if(uiNewPanel(curarea, block, "Listener", "Sound", 320, 0, 318, 204)==0) return;
 
-	mixrate = sound_get_mixrate();
-	sprintf(mixrateinfo, "Game Mixrate: %d Hz", mixrate);
-	uiDefBut(block, LABEL, 0, mixrateinfo, xco,yco,295,20, 0, 0, 0, 0, 0, "");
-
-	yco -= 30;
 	uiDefBut(block, LABEL, 0, "Game listener settings:",xco,yco,195,20, 0, 0, 0, 0, 0, "");
 
 	yco -= 30;
diff --git a/source/blender/src/editsound.c b/source/blender/src/editsound.c
index 95b3a3d3021..71187f6bd8b 100644
--- a/source/blender/src/editsound.c
+++ b/source/blender/src/editsound.c
@@ -530,38 +530,11 @@ static int sound_get_filetype_from_header(bSound *sound, PackedFile *pf)
 			filetype = SAMPLE_WAV;
 		}
 		else
-			/* only fmod supports compressed wav */
-#ifdef USE_FMOD
 		{
-			/* and only valid publishers may use compressed wav */
-			switch (shortbuf)
-			{
-			case SND_WAVE_FORMAT_ADPCM:
-			case SND_WAVE_FORMAT_ALAW:
-			case SND_WAVE_FORMAT_MULAW:
-			case SND_WAVE_FORMAT_DIALOGIC_OKI_ADPCM:
-			case SND_WAVE_FORMAT_CONTROL_RES_VQLPC:
-			case SND_WAVE_FORMAT_GSM_610:
-			case SND_WAVE_FORMAT_MPEG3:
-				filetype = SAMPLE_WAV;
-				break;
-			default:
-#endif
-				{
-					filetype = SAMPLE_INVALID;
-					if (G.f & G_DEBUG) printf("Unsupported wav compression\n");
-				}
-			}
-#ifdef USE_FMOD
+			filetype = SAMPLE_INVALID;
+			if (G.f & G_DEBUG) printf("Unsupported wav compression\n");
 		}
 	}
-	else if (!memcmp(buffer, "OggS", 4)) {
-		filetype = SAMPLE_OGG_VORBIS;
-	}
-	else if ((!memcmp(buffer, "ID3", 3)) || (!memcmp(buffer, "", 2))) {
-		filetype = SAMPLE_MP3;
-	}
-#endif
 	else {
 		filetype = SAMPLE_INVALID;
 		if (G.f & G_DEBUG) printf("Unsupported sound format: %s\n", sound->name);
@@ -583,21 +556,6 @@ static int check_filetype(bSound *sound, PackedFile *pf)
 	// a simple check to see what kind of sample we're dealing with
 	if (stricmp(pdest, ".wav") == 0)
 		sound->sample->type = SAMPLE_WAV;
-
-#ifdef USE_FMOD
-	if (stricmp(pdest, ".mp2") == 0)
-		sound->sample->type = SAMPLE_MP2;
-	if (stricmp(pdest, ".mp3") == 0)
-		sound->sample->type = SAMPLE_MP3;
-	if (stricmp(pdest, ".ogg") == 0)
-		sound->sample->type = SAMPLE_OGG_VORBIS;
-	if (stricmp(pdest, ".raw") == 0)
-		sound->sample->type = SAMPLE_RAW;
-	if (stricmp(pdest, ".wma") == 0)
-		sound->sample->type = SAMPLE_WMA;
-	if (stricmp(pdest, ".asf") == 0)
-		sound->sample->type = SAMPLE_ASF;
-#endif
 */
 	sound->sample->type = sound_get_filetype_from_header(sound, pf);
 
@@ -1061,12 +1019,6 @@ void sound_init_audio(void)
 }
 
 
-int sound_get_mixrate(void)
-{
-	return MIXRATE;
-}
-
-
 void sound_exit_audio(void)
 {
 	if(ghSoundScene) {
diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk
index 7a709c11432..70fef129867 100644
--- a/source/nan_definitions.mk
+++ b/source/nan_definitions.mk
@@ -185,7 +185,6 @@ endif
     export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION)
     export NAN_PYTHON_LIB ?= $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a
     export NAN_OPENAL ?= $(LCGDIR)/openal
-    export NAN_FMOD ?= $(LCGDIR)/fmod
     export NAN_JPEG ?= $(LCGDIR)/jpeg
     export NAN_PNG ?= $(LCGDIR)/png
     export NAN_TIFF ?= $(LCGDIR)/tiff
@@ -239,7 +238,6 @@ endif
     endif
 
     export NAN_OPENAL ?= $(LCGDIR)/openal
-    export NAN_FMOD ?= $(LCGDIR)/fmod
     export NAN_JPEG ?= $(LCGDIR)/jpeg
     export NAN_PNG ?= $(LCGDIR)/png
     export NAN_TIFF ?= $(LCGDIR)/tiff
@@ -297,7 +295,6 @@ endif
     export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION)
     export NAN_PYTHON_LIB ?= $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a
     export NAN_OPENAL ?= /usr/local
-    export NAN_FMOD ?= $(LCGDIR)/fmod
     export NAN_JPEG ?= /usr/local
     export NAN_PNG ?= /usr/local
     export NAN_TIFF ?= /usr/local
@@ -342,7 +339,6 @@ endif
     export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION)
     export NAN_PYTHON_LIB ?= $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a -lpthread
     export NAN_OPENAL ?= $(LCGDIR)/openal
-    export NAN_FMOD ?= $(LCGDIR)/fmod
     export NAN_JPEG ?= $(LCGDIR)/jpeg
     export NAN_PNG ?= $(LCGDIR)/png
     export NAN_TIFF ?= $(LCGDIR)/tiff
@@ -392,7 +388,6 @@ endif
     export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION)
     export NAN_PYTHON_LIB ?= $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a
     export NAN_OPENAL ?= /usr
-    export NAN_FMOD ?= $(LCGDIR)/fmod
     export NAN_JPEG ?= /usr
     export NAN_PNG ?= /usr
     export NAN_TIFF ?= /usr
@@ -450,7 +445,6 @@ endif
     export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION)
     export NAN_PYTHON_LIB ?= $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a
     export NAN_OPENAL ?= $(LCGDIR)/openal
-    export NAN_FMOD ?= $(LCGDIR)/fmod
     export NAN_JPEG ?= $(LCGDIR)/jpeg
     export NAN_PNG ?= $(LCGDIR)/png
     export NAN_TIFF ?= $(LCGDIR)/tiff
@@ -493,7 +487,6 @@ endif
     export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION)
     export NAN_PYTHON_LIB ?= $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a
     export NAN_OPENAL ?= $(LCGDIR)/openal 
-    export NAN_FMOD ?= $(LCGDIR)/fmod
     export NAN_JPEG ?= $(LCGDIR)/jpeg
     export NAN_PNG ?= $(LCGDIR)/png
     export NAN_TIFF ?= /usr
@@ -550,7 +543,6 @@ endif
       export NAN_SDLCFLAGS ?= -I$(NAN_SDL)/include
     endif
     export NAN_OPENAL ?= $(LCGDIR)/openal
-    export NAN_FMOD ?= $(LCGDIR)/fmod
     export NAN_JPEG ?= $(LCGDIR)/jpeg
     export NAN_PNG ?= $(LCGDIR)/png
     export NAN_TIFF ?= $(LCGDIR)/tiff
@@ -594,7 +586,6 @@ endif
     export NAN_PYTHON_LIB ?= $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a
 
     export NAN_OPENAL ?= $(LCGDIR)/openal
-    export NAN_FMOD ?= $(LCGDIR)/fmod
     export NAN_JPEG ?= $(LCGDIR)/jpeg
     export NAN_PNG ?= $(LCGDIR)/png
     export NAN_TIFF ?= $(LCGDIR)/tiff
diff --git a/tools/btools.py b/tools/btools.py
index 79f4717a262..911376856ad 100755
--- a/tools/btools.py
+++ b/tools/btools.py
@@ -31,7 +31,6 @@ def validate_arguments(args, bc):
 			'WITH_BF_OPENAL', 'BF_OPENAL', 'BF_OPENAL_INC', 'BF_OPENAL_LIB', 'BF_OPENAL_LIBPATH', 'WITH_BF_STATICOPENAL', 'BF_OPENAL_LIB_STATIC',
 			'WITH_BF_SDL', 'BF_SDL', 'BF_SDL_INC', 'BF_SDL_LIB', 'BF_SDL_LIBPATH',
 			'BF_PTHREADS', 'BF_PTHREADS_INC', 'BF_PTHREADS_LIB', 'BF_PTHREADS_LIBPATH',
-			'WITH_BF_FMOD',
 			'WITH_BF_OPENEXR', 'BF_OPENEXR', 'BF_OPENEXR_INC', 'BF_OPENEXR_LIB', 'BF_OPENEXR_LIBPATH', 'WITH_BF_STATICOPENEXR', 'BF_OPENEXR_LIB_STATIC',
 			'WITH_BF_DDS',
 			'WITH_BF_FFMPEG', 'BF_FFMPEG_LIB','BF_FFMPEG_EXTRA', 'BF_FFMPEG',  'BF_FFMPEG_INC',
@@ -190,9 +189,6 @@ def read_opts(cfg, args):
 		('BF_PTHREADS_LIB', 'Pthreads library', ''),
 		('BF_PTHREADS_LIBPATH', 'Pthreads library path', ''),
 
-		(BoolVariable('WITH_BF_FMOD', 'Use FMOD if true', False)),
-		#  BF_FMOD = $(LCGDIR)/fmod
-
 		(BoolVariable('WITH_BF_OPENEXR', 'Use OPENEXR if true', True)),
 		(BoolVariable('WITH_BF_STATICOPENEXR', 'Staticly link to OpenEXR', False)),
 		('BF_OPENEXR', 'OPENEXR base path', ''),