[#18260] FMOD Removal
authorCampbell Barton <ideasman42@gmail.com>
Tue, 24 Mar 2009 09:09:10 +0000 (09:09 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 24 Mar 2009 09:09:10 +0000 (09:09 +0000)
from Jorg Muller (nexyon)

also removed references to CVS in install

24 files changed:
config/darwin-config.py
config/irix6-config.py
config/linux2-config.py
config/linuxcross-config.py
config/openbsd3-config.py
config/sunos5-config.py
config/win32-mingw-config.py
config/win32-vc-config.py
intern/SoundSystem/Makefile
intern/SoundSystem/SND_DependKludge.h
intern/SoundSystem/SoundDefines.h
intern/SoundSystem/dummy/SND_DummyDevice.cpp
intern/SoundSystem/intern/Makefile
intern/SoundSystem/intern/SND_DeviceManager.cpp
intern/SoundSystem/intern/SND_Scene.cpp
intern/SoundSystem/intern/SND_Utils.cpp
intern/SoundSystem/openal/SND_OpenALDevice.cpp
release/windows/specific.sh
source/Makefile
source/blender/include/BIF_editsound.h
source/blender/src/buttons_scene.c
source/blender/src/editsound.c
source/nan_definitions.mk
tools/btools.py

index 39c9b9df4ff94ef91cf5f1c661adc336de7e39b3..04a44372383a16f3a069afa847a70c154d049bee 100644 (file)
@@ -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'
index 8be12d649bf80f921d6002f577702a21d22fe062..2c57a2bba8a700d5e9d5cd8b9b68cab148d0cd22 100644 (file)
@@ -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'
index 102bb2e5e4c94da2efb10079cf3e8beb870ec4d8..b2f4066e0ed27b565c8d34fdd07d6306bd14145a 100644 (file)
@@ -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'
index 5981c8b96e518e5d3fcfcdbd4947a5d4a2388732..ac9e8bc23a53ccb9d070eb4e7de08d6abfd465a6 100644 (file)
@@ -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'
index 8fc334874f98eb553b0f18143660912367a7023c..3a36f8df6632b175cd36f85cc273fcd861dcdb96 100644 (file)
@@ -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'
index dda7d0ff2f391305168e015767abba01d88c587c..6fa9529e1cd77eceaaffb299b8918626433fe787 100644 (file)
@@ -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'
index b94747637e91729463d0d55fdbb823fae556a0a9..a102c423fb5ddf23f4755939d01e9747d8a0a6be 100644 (file)
@@ -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'
index d4e9fa9b30ebad942b8998d4a48d69a6c3d12752..6e56af2d95eee88716a2be44bd9267920c16905e 100644 (file)
@@ -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'
index 051e2643a87dd7a0a1cfe95c5bec69d8b7ffecf6..4e5a83639554b3d0634bdb3f014870b239bcc37f 100644 (file)
@@ -38,7 +38,6 @@ DIRS += dummy
 
 ifneq ($(NAN_NO_OPENAL),true)
   ifeq ($(OS),windows)
-      DIRS += fmod 
       DIRS += openal sdl
   endif
   ifeq ($(OS),darwin)
index 1a95f977abed6c6e985959d7f9e65253124cc0f5..06d4ec9c0c90abb9b09611103801d6ae800a8e80 100644 (file)
@@ -43,9 +43,6 @@
 #      ifdef USE_OPENAL
 #              undef USE_OPENAL
 #      endif
-#      ifdef USE_FMOD
-#              undef USE_FMOD
-#      endif
 #endif
 
 #endif /* NO_SOUND */
index 450fde187b5c917d7c8b9c610ba44093aadbe597..5238507c866b59c5c026c03cd31b1cda1361ddb3 100644 (file)
@@ -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
 {
index 3e5874f02cac4a835bd0c60bdc70481b565a5b79..672c73e9c5215d78ce17d24d46d62a12405fdc6c 100644 (file)
@@ -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
index c52be01f69ffc3d250fa910409f5490e484ac454..7684b6b0bcab5c761ff0043b57d79d8d0dfc5136 100644 (file)
@@ -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.
index 215c0f5b6fa114a6a008e4ef37482a2d349b714a..c4bc887dffe51de74bbfb037fd66859f25080e20 100644 (file)
@@ -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:
                {
index 9d050a81161f8b3a8f022694dc94bb8786322112..af1b43a08aa7dd0cb6321d9b6011269cd39b9472 100644 (file)
@@ -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
index 26ce106a24e5cbab243e2c3f7694211426dfb8a9..7890d2a3d63e7ce5052eb735ee9129629beb0680 100644 (file)
@@ -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)
        {
index 9ce30f985ac1f0acd47c24238f3fc6a924b34c75..3649cf6de5a760bf87cb11785407ab20d317d101 100644 (file)
@@ -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();
 
 }
index e3ecfcb959fc0e72fd752982b65e0a8bcae066ef..5df90869914f3aacf792f9cb33853ddb23494fd5 100755 (executable)
@@ -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
 
index 239ca9e0d1bd13bd2e0c3796c88a30dee23126a4..d8dee601998a9f86dffa9121542f06047f29df9a 100644 (file)
@@ -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
index 6561b3e6849fab1821c32681b8aa20601e08baee..e04bd43307e51fa93af813f7926564e59b7d6293 100644 (file)
@@ -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);
index be988c5a68abd8aad9a4d53f11edc8076b99867a..aa072285556b6600ef6b3bd7754046d3c46db54c 100644 (file)
@@ -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;
index 95b3a3d30214046e0428040bf2c64fc3f19527fe..71187f6bd8b7fe56127bc3990adf07207d6a4c80 100644 (file)
@@ -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) {
index 7a709c11432b763abf4fda13d6583ebd36d0760c..70fef1298679061df6b9866f827336fc1cf52cae 100644 (file)
@@ -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
index 79f4717a262a821dc5c6df298bb11752968a7e86..911376856adf84e7ced30fdad7035ec879bdbf73 100755 (executable)
@@ -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', ''),