Changeset 7171 in orxonox.OLD

Timestamp:

Feb 20, 2006, 2:29:02 PM (18 years ago)

Author:

bensch

Message:

dylib: more like in the real world… should work on win too

Location:

branches/shared_lib/src

Files:

• orxonox.cc (modified) (1 diff)
• util/loading/dynamic_loader.cc (modified) (3 diffs)
• util/loading/dynamic_loader.h (modified) (2 diffs)
• world_entities/Makefile.am (modified) (1 diff)

branches/shared_lib/src/orxonox.cc

@@ -341 +341 @@
 //     return false;
 //   }
-  DynamicLoader::loadDyLib("libORXground_turret.so");
+  DynamicLoader::loadDyLib("src/world_entities/.libs/libORXground_turret.so");
 
   // start the collision detection engine

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

@@ -17 +17 @@
 
 #include "dynamic_loader.h"
-
-
-#include <dlfcn.h>
 
 
@@ -47 +44 @@
   // delete what has to be deleted here
   if (this->handle != NULL)
-    dlclose(this->handle);
+    lt_dlclose(this->handle);
 }
 
@@ -53 +50 @@
 bool DynamicLoader::loadDynamicLib(const std::string& libName)
 {
-  this->handle = dlopen(&libName[0], RTLD_NOW);
+  if (lt_dlinit () != 0)
+  {
+    PRINTF(1)("Initializing LT_DL_LIB\n");
+  }
+  this->handle = lt_dlopen(&libName[0]);
   if(this->handle == NULL)
   {
     return false;
   }
-  void *mkr = dlsym( this->handle, "maker");
+  //void *mkr = dlsym( this->handle, "maker");
 }
 
 bool DynamicLoader::loadDyLib(const char* libName)
 {
+  if (lt_dlinit () != 0)
+  {
+    PRINTF(1)("Initializing LT_DL_LIB\n");
+  }
+
   void* handle;
-  handle = dlopen(libName, RTLD_NOW);
+  handle = lt_dlopen(libName);
   if(handle == NULL)
   {
-    PRINTF(1)("unable to load %s: %s\n", libName, dlerror());
+    PRINTF(1)("unable to load %s: %s\n", libName, lt_dlerror());
 
     return false;

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

@@ -8 +8 @@
 
 #include "factory.h"
+#include <ltdl.h>
 
 #include <string>
@@ -28 +29 @@
 
 private:
-  void*      handle;
+  lt_dlhandle      handle;
 };
 

branches/shared_lib/src/world_entities/Makefile.am

@@ -4 +4 @@
 
 noinst_LIBRARIES = libORXwe.a
-pkglib_LTLIBRARIES = libORXground_turret.la
+lib_LTLIBRARIES = libORXground_turret.la
 libORXground_turret_la_SOURCES = npcs/ground_turret.cc