Changeset 7174 in orxonox.OLD for branches/shared_lib/src/util/loading/dynamic_loader.cc

Timestamp:

Feb 21, 2006, 10:48:52 PM (18 years ago)

Author:

bensch

Message:

orxonox/dylib: now the dylibLoader should work

File:

• branches/shared_lib/src/util/loading/dynamic_loader.cc (modified) (4 diffs)

branches/shared_lib/src/util/loading/dynamic_loader.cc

@@ -17 +17 @@
 
 #include "dynamic_loader.h"
-
+#include "resource_manager.h"
 
 using namespace std;
-
 
 /**
@@ -36 +35 @@
 }
 
+/**
+ * @brief initializes the Dynamic Library loader
+ * @returns true on succes, false otherwise
+ */
+bool DynamicLoader::initialize()
+{
+  if (lt_dlinit () != 0)
+  {
+    PRINTF(1)("Initializing LT_DL_LIB: %s\n", lt_dlerror());
+    return false;
+  }
+  else
+    return true;
+}
 
 /**
@@ -50 +63 @@
 bool DynamicLoader::loadDynamicLib(const std::string& libName)
 {
-  if (lt_dlinit () != 0)
-  {
-    PRINTF(1)("Initializing LT_DL_LIB\n");
-  }
-  this->handle = lt_dlopen(&libName[0]);
+  DynamicLoader::initialize();
+
+  this->handle = lt_dlopenext(&libName[0]);
   if(this->handle == NULL)
   {
     return false;
   }
-  //void *mkr = dlsym( this->handle, "maker");
 }
 
 bool DynamicLoader::loadDyLib(const char* libName)
 {
-  if (lt_dlinit () != 0)
-  {
-    PRINTF(1)("Initializing LT_DL_LIB\n");
-  }
-
+  DynamicLoader::initialize();
   void* handle;
-  handle = lt_dlopen(libName);
+  handle = lt_dlopenext(libName);
   if(handle == NULL)
   {
@@ -77 +83 @@
     return false;
   }
-//  void *mkr = dlsym("maker");
 
 }
 
+void DynamicLoader::addSearchDir(const char* searchDir)
+{
+  DynamicLoader::initialize();
 
-BaseObject* DynamicLoader::fabricateObject(const TiXmlElement* root) const
+  lt_dladdsearchdir(searchDir);
+}
+
+/**
+ * @param relSearchDir: the Relative directory to add to searchPath of lt_dl
+ * @returns true if the Path was Valid, false otherwise
+ */
+bool DynamicLoader::addSearchDirRelative(const char* relSearchDir)
 {
+  char* absSearchDir = ResourceManager::getAbsDir(relSearchDir);
+  if (ResourceManager::isDir(absSearchDir))
+  {
+    DynamicLoader::addSearchDir(absSearchDir);
+    delete[] absSearchDir;
+    return true;
+  }
+  else
+  {
+    delete[] absSearchDir;
+    return false;
+  }
 }
+
+
+const char* DynamicLoader::getSearchDir()
+{
+  return lt_dlgetsearchpath();
+}