Changeset 7187 in orxonox.OLD for branches/shared_lib/src

Timestamp:

Feb 22, 2006, 2:49:47 AM (18 years ago)

Author:

bensch

Message:

ltdl

Location:

branches/shared_lib/src

Files:

• lib/BuildLibs.am (modified) (1 diff)
• lib/Makefile.am (modified) (1 diff)
• lib/libltdl (moved) (moved from branches/shared_lib/libltdl)
• lib/libltdl/Makefile.in (deleted)
• orxonox.cc (modified) (2 diffs)
• util/Makefile.am (modified) (1 diff)
• util/loading/dynamic_loader.h (modified) (1 diff)
• util/loading/resource_manager.cc (modified) (1 diff)

branches/shared_lib/src/lib/BuildLibs.am

@@ -15 +15 @@
                 $(LIB_PREFIX)/parser/tinyxml/libtinyxml.a \
                 $(LIB_PREFIX)/parser/ini_parser/libIniParser.a \
+                $(LIB_PREFIX)/libltdl/libltdl.a \
                 $(LIB_PREFIX)/shell/libORXshell.a \
                 $(LIB_PREFIX)/math/libORXmath.a

branches/shared_lib/src/lib/Makefile.am

@@ -48 +48 @@
         shell \
         gui \
+        libltdl \
         .

branches/shared_lib/src/orxonox.cc

@@ -54 +54 @@
 
 #include "load_param_description.h"
+#include "dynamic_loader.h"
 
 #include "network_manager.h"
@@ -290 +291 @@
 }
 
-#include "dynamic_loader.h"
-#include <dlfcn.h>
-
 /**
  * initializes and loads resource files

branches/shared_lib/src/util/Makefile.am

@@ -3 +3 @@
 
 noinst_LIBRARIES = libORXutils.a
+
+INCLUDES = $(LTDLINCL)
 
 

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

@@ -8 +8 @@
 
 #include "factory.h"
-#include <ltdl.h>
+#include "lib/libltdl/ltdl.h"
 
 #include <string>

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

@@ -1049 +1049 @@
   {
     char cwd[1024];
-    char* errno = getcwd(cwd, 1024);
-    if (errno == 0)
+    char* errorCode = getcwd(cwd, 1024);
+    if (errorCode == 0)
       return NULL;