From 8a5f07f9c321e0abac131b0ca0124ada20c88cca Mon Sep 17 00:00:00 2001 From: rdb Date: Mon, 5 Jan 2015 18:10:45 +0100 Subject: [PATCH] Forgot two HAVE_FMODEX lines --- panda/src/audiotraits/config_fmodAudio.cxx | 3 --- panda/src/audiotraits/config_fmodAudio.h | 3 --- 2 files changed, 6 deletions(-) diff --git a/panda/src/audiotraits/config_fmodAudio.cxx b/panda/src/audiotraits/config_fmodAudio.cxx index 31297c0347..0f0c1cf700 100644 --- a/panda/src/audiotraits/config_fmodAudio.cxx +++ b/panda/src/audiotraits/config_fmodAudio.cxx @@ -13,7 +13,6 @@ //////////////////////////////////////////////////////////////////// #include "pandabase.h" -#ifdef HAVE_FMODEX //[ #include "config_fmodAudio.h" #include "audioManager.h" @@ -73,5 +72,3 @@ get_audio_manager_func_fmod_audio() { init_libFmodAudio(); return &Create_FmodAudioManager; } - -#endif //] diff --git a/panda/src/audiotraits/config_fmodAudio.h b/panda/src/audiotraits/config_fmodAudio.h index be695d21fe..cea24744c9 100644 --- a/panda/src/audiotraits/config_fmodAudio.h +++ b/panda/src/audiotraits/config_fmodAudio.h @@ -17,7 +17,6 @@ #include "pandabase.h" -#ifdef HAVE_FMODEX //[ #include "notifyCategoryProxy.h" #include "dconfig.h" #include "audioManager.h" @@ -30,6 +29,4 @@ extern ConfigVariableInt fmod_audio_preload_threshold; extern EXPCL_FMOD_AUDIO void init_libFmodAudio(); extern "C" EXPCL_FMOD_AUDIO Create_AudioManager_proc *get_audio_manager_func_fmod_audio(); -#endif //] - #endif // CONFIG_FMODAUDIO_H