Mac OS X: Attempting to fix dynamic linker error with FMOD plugin

It is conceivable that loading and unloading the audio plugins at startup confuses the linker in 10.6. Let's see if this makes a difference.
skyjake · Oct 29, 2012 · adbc718 · adbc718
1 parent fa1f8b3
commit adbc718
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/doomsday/engine/portable/src/dd_plugin.c b/doomsday/engine/portable/src/dd_plugin.c
@@ -71,6 +71,12 @@ static int loadPlugin(void* libraryFile, const char* fileName, const char* plugi
     DENG_ASSERT(fileName && fileName[0]);
     DENG_ASSERT(pluginPath && pluginPath[0]);
 
+    if(strcasestr("/bin/audio_", pluginPath))
+    {
+        // Do not touch audio plugins at this point.
+        return true;
+    }
+
     plugin = Library_New(pluginPath);
     if(!plugin)
     {

diff --git a/doomsday/libdeng2/src/core/library.cpp b/doomsday/libdeng2/src/core/library.cpp
@@ -28,6 +28,7 @@ Library::Library(const String& nativePath)
     : _library(0), _type(DEFAULT_TYPE)
 {
     LOG_AS("Library::Library");
+    LOG_TRACE("Loading ") << nativePath;
 
     /*
 #ifdef MACOSX
@@ -74,6 +75,9 @@ Library::~Library()
 {
     if(_library)
     {
+        LOG_AS("Library::~Library");
+        LOG_TRACE("Unlading ") << _library->fileName();
+
         // Automatically call the shutdown function, if one exists.
         if(_type.beginsWith("deng-plugin/") && hasSymbol("deng_ShutdownPlugin"))
         {